vanilla: remove all origins, closes #2203

Mon, 26 Aug 2019 12:14:53 +0200

author
David Demelier <markand@malikania.fr>
date
Mon, 26 Aug 2019 12:14:53 +0200
changeset 902
a133976e0783
parent 901
e2de15b7d2b1
child 903
931d2626ae5f

vanilla: remove all origins, closes #2203

CHANGES.md file | annotate | diff | comparison | revisions
README.md file | annotate | diff | comparison | revisions
STYLE.md file | annotate | diff | comparison | revisions
accessibility/at-spi2-atk/at-spi2-atk.sh file | annotate | diff | comparison | revisions
accessibility/at-spi2-core/at-spi2-core.sh file | annotate | diff | comparison | revisions
accessibility/atk/atk.sh file | annotate | diff | comparison | revisions
audio/cdparanoia/cdparanoia.sh file | annotate | diff | comparison | revisions
audio/flac/flac.sh file | annotate | diff | comparison | revisions
audio/jack2/jack2.sh file | annotate | diff | comparison | revisions
audio/lame/lame.sh file | annotate | diff | comparison | revisions
audio/libcanberra/libcanberra.sh file | annotate | diff | comparison | revisions
audio/libsndfile/libsndfile.sh file | annotate | diff | comparison | revisions
audio/libvorbis/libvorbis.sh file | annotate | diff | comparison | revisions
audio/mpg123/mpg123.sh file | annotate | diff | comparison | revisions
audio/openal-soft/openal-soft.sh file | annotate | diff | comparison | revisions
audio/pulseaudio/pulseaudio.sh file | annotate | diff | comparison | revisions
audio/sdl2-mixer/sdl2-mixer.sh file | annotate | diff | comparison | revisions
audio/speex/speex.sh file | annotate | diff | comparison | revisions
audio/taglib/taglib.sh file | annotate | diff | comparison | revisions
bluetooth/bluez/bluez.sh file | annotate | diff | comparison | revisions
compression/libarchive/libarchive.sh file | annotate | diff | comparison | revisions
compression/libzip/libzip.sh file | annotate | diff | comparison | revisions
compression/msgpack/msgpack.sh file | annotate | diff | comparison | revisions
compression/unzip/unzip.sh file | annotate | diff | comparison | revisions
compression/xz/xz.sh file | annotate | diff | comparison | revisions
compression/zip/zip.sh file | annotate | diff | comparison | revisions
core/acl/acl.sh file | annotate | diff | comparison | revisions
core/attr/attr.sh file | annotate | diff | comparison | revisions
core/bash-completion/bash-completion.sh file | annotate | diff | comparison | revisions
core/bc/bc.sh file | annotate | diff | comparison | revisions
core/busybox/busybox.sh file | annotate | diff | comparison | revisions
core/consolekit2/consolekit2.sh file | annotate | diff | comparison | revisions
core/coreutils/coreutils.sh file | annotate | diff | comparison | revisions
core/cpio/cpio.sh file | annotate | diff | comparison | revisions
core/diffutils/diffutils.sh file | annotate | diff | comparison | revisions
core/e2fsprogs/e2fsprogs.sh file | annotate | diff | comparison | revisions
core/efibootmgr/efibootmgr.sh file | annotate | diff | comparison | revisions
core/elfutils/elfutils.sh file | annotate | diff | comparison | revisions
core/eudev/eudev.sh file | annotate | diff | comparison | revisions
core/file/file.sh file | annotate | diff | comparison | revisions
core/findutils/findutils.sh file | annotate | diff | comparison | revisions
core/gawk/gawk.sh file | annotate | diff | comparison | revisions
core/grep/grep.sh file | annotate | diff | comparison | revisions
core/grub/grub.sh file | annotate | diff | comparison | revisions
core/kbd/kbd.sh file | annotate | diff | comparison | revisions
core/kmod/kmod.sh file | annotate | diff | comparison | revisions
core/less/less.sh file | annotate | diff | comparison | revisions
core/libcap/libcap.sh file | annotate | diff | comparison | revisions
core/lvm2/lvm2.sh file | annotate | diff | comparison | revisions
core/mandoc/mandoc.sh file | annotate | diff | comparison | revisions
core/procps/procps.sh file | annotate | diff | comparison | revisions
core/rhash/rhash.sh file | annotate | diff | comparison | revisions
core/sed/sed.sh file | annotate | diff | comparison | revisions
core/tar/tar.sh file | annotate | diff | comparison | revisions
core/texinfo/texinfo.sh file | annotate | diff | comparison | revisions
core/tmux/tmux.sh file | annotate | diff | comparison | revisions
core/util-linux/util-linux.sh file | annotate | diff | comparison | revisions
crypto/gcr/gcr.sh file | annotate | diff | comparison | revisions
crypto/gnutls/gnutls.sh file | annotate | diff | comparison | revisions
crypto/libgpg-error/libgpg-error.sh file | annotate | diff | comparison | revisions
crypto/libressl/libressl.sh file | annotate | diff | comparison | revisions
crypto/nettle/nettle.sh file | annotate | diff | comparison | revisions
crypto/p11-kit/p11-kit.sh file | annotate | diff | comparison | revisions
databases/sqlite/sqlite.sh file | annotate | diff | comparison | revisions
desktop/dconf/dconf.sh file | annotate | diff | comparison | revisions
desktop/desktop-file-utils/desktop-file-utils.sh file | annotate | diff | comparison | revisions
desktop/icon-naming-utils/icon-naming-utils.sh file | annotate | diff | comparison | revisions
desktop/libnotify/libnotify.sh file | annotate | diff | comparison | revisions
desktop/libwnck/libwnck.sh file | annotate | diff | comparison | revisions
desktop/libwnck2/libwnck2.sh file | annotate | diff | comparison | revisions
desktop/startup-notification/startup-notification.sh file | annotate | diff | comparison | revisions
desktop/zenity/zenity.sh file | annotate | diff | comparison | revisions
dev/autoconf/autoconf.sh file | annotate | diff | comparison | revisions
dev/autoconf213/autoconf213.sh file | annotate | diff | comparison | revisions
dev/binutils/binutils.sh file | annotate | diff | comparison | revisions
dev/bison/bison.sh file | annotate | diff | comparison | revisions
dev/clang/clang.sh file | annotate | diff | comparison | revisions
dev/cmake/cmake.sh file | annotate | diff | comparison | revisions
dev/doxygen/doxygen.sh file | annotate | diff | comparison | revisions
dev/gcc/gcc.sh file | annotate | diff | comparison | revisions
dev/gobject-introspection/gobject-introspection.sh file | annotate | diff | comparison | revisions
dev/gtk-doc/gtk-doc.sh file | annotate | diff | comparison | revisions
dev/help2man/help2man.sh file | annotate | diff | comparison | revisions
dev/intltool/intltool.sh file | annotate | diff | comparison | revisions
dev/lld/lld.sh file | annotate | diff | comparison | revisions
dev/lldb/lldb.sh file | annotate | diff | comparison | revisions
dev/llvm/llvm.sh file | annotate | diff | comparison | revisions
dev/make/make.sh file | annotate | diff | comparison | revisions
dev/mercurial/mercurial.sh file | annotate | diff | comparison | revisions
dev/meson/meson.sh file | annotate | diff | comparison | revisions
dev/swig/swig.sh file | annotate | diff | comparison | revisions
dns/libidn/libidn.sh file | annotate | diff | comparison | revisions
dns/libidn2/libidn2.sh file | annotate | diff | comparison | revisions
editors/nano/nano.sh file | annotate | diff | comparison | revisions
editors/vim/vim.sh file | annotate | diff | comparison | revisions
emulation/libretro-craft/libretro-craft.sh file | annotate | diff | comparison | revisions
emulation/libretro-dolphin/libretro-dolphin.sh file | annotate | diff | comparison | revisions
emulation/libretro-openlara/libretro-openlara.sh file | annotate | diff | comparison | revisions
emulation/retroarch/retroarch.sh file | annotate | diff | comparison | revisions
fonts/font-adobe-100dpi/font-adobe-100dpi.sh file | annotate | diff | comparison | revisions
fonts/font-adobe-75dpi/font-adobe-75dpi.sh file | annotate | diff | comparison | revisions
fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.sh file | annotate | diff | comparison | revisions
fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.sh file | annotate | diff | comparison | revisions
fonts/font-adobe-utopia-type1/font-adobe-utopia-type1.sh file | annotate | diff | comparison | revisions
fonts/font-arabic-misc/font-arabic-misc.sh file | annotate | diff | comparison | revisions
fonts/font-bh-100dpi/font-bh-100dpi.sh file | annotate | diff | comparison | revisions
fonts/font-bh-75dpi/font-bh-75dpi.sh file | annotate | diff | comparison | revisions
fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.sh file | annotate | diff | comparison | revisions
fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.sh file | annotate | diff | comparison | revisions
fonts/font-bh-ttf/font-bh-ttf.sh file | annotate | diff | comparison | revisions
fonts/font-bh-type1/font-bh-type1.sh file | annotate | diff | comparison | revisions
fonts/font-bitstream-100dpi/font-bitstream-100dpi.sh file | annotate | diff | comparison | revisions
fonts/font-bitstream-75dpi/font-bitstream-75dpi.sh file | annotate | diff | comparison | revisions
fonts/font-bitstream-speedo/font-bitstream-speedo.sh file | annotate | diff | comparison | revisions
fonts/font-bitstream-type1/font-bitstream-type1.sh file | annotate | diff | comparison | revisions
fonts/font-cronyx-cyrillic/font-cronyx-cyrillic.sh file | annotate | diff | comparison | revisions
fonts/font-cursor-misc/font-cursor-misc.sh file | annotate | diff | comparison | revisions
fonts/font-daewoo-misc/font-daewoo-misc.sh file | annotate | diff | comparison | revisions
fonts/font-dec-misc/font-dec-misc.sh file | annotate | diff | comparison | revisions
fonts/font-ibm-type1/font-ibm-type1.sh file | annotate | diff | comparison | revisions
fonts/font-isas-misc/font-isas-misc.sh file | annotate | diff | comparison | revisions
fonts/font-jis-misc/font-jis-misc.sh file | annotate | diff | comparison | revisions
fonts/font-micro-misc/font-micro-misc.sh file | annotate | diff | comparison | revisions
fonts/font-misc-cyrillic/font-misc-cyrillic.sh file | annotate | diff | comparison | revisions
fonts/font-misc-ethiopic/font-misc-ethiopic.sh file | annotate | diff | comparison | revisions
fonts/font-misc-meltho/font-misc-meltho.sh file | annotate | diff | comparison | revisions
fonts/font-misc-misc/font-misc-misc.sh file | annotate | diff | comparison | revisions
fonts/font-mutt-misc/font-mutt-misc.sh file | annotate | diff | comparison | revisions
fonts/font-schumacher-misc/font-schumacher-misc.sh file | annotate | diff | comparison | revisions
fonts/font-screen-cyrillic/font-screen-cyrillic.sh file | annotate | diff | comparison | revisions
fonts/font-sony-misc/font-sony-misc.sh file | annotate | diff | comparison | revisions
fonts/font-sun-misc/font-sun-misc.sh file | annotate | diff | comparison | revisions
fonts/font-winitzki-cyrillic/font-winitzki-cyrillic.sh file | annotate | diff | comparison | revisions
fonts/font-xfree86-type1/font-xfree86-type1.sh file | annotate | diff | comparison | revisions
fonts/fontconfig/fontconfig.sh file | annotate | diff | comparison | revisions
fonts/freetype/freetype.sh file | annotate | diff | comparison | revisions
fonts/harfbuzz/harfbuzz.sh file | annotate | diff | comparison | revisions
fonts/pango/pango.sh file | annotate | diff | comparison | revisions
fonts/sdl2-ttf/sdl2-ttf.sh file | annotate | diff | comparison | revisions
games/supertux/supertux.sh file | annotate | diff | comparison | revisions
games/wesnoth/wesnoth.sh file | annotate | diff | comparison | revisions
graphics/cairo/cairo.sh file | annotate | diff | comparison | revisions
graphics/gdk-pixbuf/gdk-pixbuf.sh file | annotate | diff | comparison | revisions
graphics/glbinding/glbinding.sh file | annotate | diff | comparison | revisions
graphics/glew/glew.sh file | annotate | diff | comparison | revisions
graphics/graphviz/graphviz.sh file | annotate | diff | comparison | revisions
graphics/gtk/gtk.sh file | annotate | diff | comparison | revisions
graphics/gtk2/gtk2.sh file | annotate | diff | comparison | revisions
graphics/gtksourceview/gtksourceview.sh file | annotate | diff | comparison | revisions
graphics/libdrm/libdrm.sh file | annotate | diff | comparison | revisions
graphics/libepoxy/libepoxy.sh file | annotate | diff | comparison | revisions
graphics/libexif/libexif.sh file | annotate | diff | comparison | revisions
graphics/libgd/libgd.sh file | annotate | diff | comparison | revisions
graphics/libjpeg-turbo/libjpeg-turbo.sh file | annotate | diff | comparison | revisions
graphics/librsvg/librsvg.sh file | annotate | diff | comparison | revisions
graphics/libtiff/libtiff.sh file | annotate | diff | comparison | revisions
graphics/libwebp/libwebp.sh file | annotate | diff | comparison | revisions
graphics/mesa/mesa.sh file | annotate | diff | comparison | revisions
graphics/openjpeg/openjpeg.sh file | annotate | diff | comparison | revisions
graphics/pixman/pixman.sh file | annotate | diff | comparison | revisions
graphics/sdl2-image/sdl2-image.sh file | annotate | diff | comparison | revisions
graphics/wayland/wayland.sh file | annotate | diff | comparison | revisions
graphics/weston/weston.sh file | annotate | diff | comparison | revisions
irc/irssi/irssi.sh file | annotate | diff | comparison | revisions
irc/ngircd/ngircd.sh file | annotate | diff | comparison | revisions
lang/mozjs52/mozjs52.sh file | annotate | diff | comparison | revisions
lang/tcl/tcl.sh file | annotate | diff | comparison | revisions
lang/vala/vala.sh file | annotate | diff | comparison | revisions
lib/boost/boost.sh file | annotate | diff | comparison | revisions
lib/fuse/fuse.sh file | annotate | diff | comparison | revisions
lib/glib/glib.sh file | annotate | diff | comparison | revisions
lib/gvfs/gvfs.sh file | annotate | diff | comparison | revisions
lib/isl/isl.sh file | annotate | diff | comparison | revisions
lib/jansson/jansson.sh file | annotate | diff | comparison | revisions
lib/jsoncpp/jsoncpp.sh file | annotate | diff | comparison | revisions
lib/libaio/libaio.sh file | annotate | diff | comparison | revisions
lib/libedit/libedit.sh file | annotate | diff | comparison | revisions
lib/libevent/libevent.sh file | annotate | diff | comparison | revisions
lib/libgudev/libgudev.sh file | annotate | diff | comparison | revisions
lib/libical/libical.sh file | annotate | diff | comparison | revisions
lib/libinput/libinput.sh file | annotate | diff | comparison | revisions
lib/libnftnl/libnftnl.sh file | annotate | diff | comparison | revisions
lib/libnl/libnl.sh file | annotate | diff | comparison | revisions
lib/libpeas/libpeas.sh file | annotate | diff | comparison | revisions
lib/libusb/libusb.sh file | annotate | diff | comparison | revisions
lib/libuv/libuv.sh file | annotate | diff | comparison | revisions
lib/libwacom/libwacom.sh file | annotate | diff | comparison | revisions
lib/libxkbcommon/libxkbcommon.sh file | annotate | diff | comparison | revisions
lib/libxklavier/libxklavier.sh file | annotate | diff | comparison | revisions
lib/mpfr/mpfr.sh file | annotate | diff | comparison | revisions
lib/musl/musl.sh file | annotate | diff | comparison | revisions
lib/pcre/pcre.sh file | annotate | diff | comparison | revisions
lib/pcre2/pcre2.sh file | annotate | diff | comparison | revisions
lib/popt/popt.sh file | annotate | diff | comparison | revisions
lib/readline/readline.sh file | annotate | diff | comparison | revisions
lib/sdl2/sdl2.sh file | annotate | diff | comparison | revisions
lib/vte/vte.sh file | annotate | diff | comparison | revisions
mail/neomutt/neomutt.sh file | annotate | diff | comparison | revisions
mate/libmatekbd/libmatekbd.sh file | annotate | diff | comparison | revisions
mate/libmatemixer/libmatemixer.sh file | annotate | diff | comparison | revisions
mate/libmateweather/libmateweather.sh file | annotate | diff | comparison | revisions
mate/marco/marco.sh file | annotate | diff | comparison | revisions
mate/mate-calc/mate-calc.sh file | annotate | diff | comparison | revisions
mate/mate-desktop/mate-desktop.sh file | annotate | diff | comparison | revisions
mate/mate-icon-theme/mate-icon-theme.sh file | annotate | diff | comparison | revisions
mate/mate-menus/mate-menus.sh file | annotate | diff | comparison | revisions
mate/mate-panel/mate-panel.sh file | annotate | diff | comparison | revisions
mate/mate-polkit/mate-polkit.sh file | annotate | diff | comparison | revisions
mate/mate-session-manager/mate-session-manager.sh file | annotate | diff | comparison | revisions
mate/mate-settings-daemon/mate-settings-daemon.sh file | annotate | diff | comparison | revisions
mate/mate-terminal/mate-terminal.sh file | annotate | diff | comparison | revisions
misc/gsettings-desktop-schemas/gsettings-desktop-schemas.sh file | annotate | diff | comparison | revisions
misc/iso-codes/iso-codes.sh file | annotate | diff | comparison | revisions
misc/itstool/itstool.sh file | annotate | diff | comparison | revisions
misc/shared-mime-info/shared-mime-info.sh file | annotate | diff | comparison | revisions
multimedia/ffmpeg/ffmpeg.sh file | annotate | diff | comparison | revisions
multimedia/gst-libav/gst-libav.sh file | annotate | diff | comparison | revisions
multimedia/gst-plugins-bad/gst-plugins-bad.sh file | annotate | diff | comparison | revisions
multimedia/gst-plugins-base/gst-plugins-base.sh file | annotate | diff | comparison | revisions
multimedia/gst-plugins-good/gst-plugins-good.sh file | annotate | diff | comparison | revisions
multimedia/gst-plugins-ugly/gst-plugins-ugly.sh file | annotate | diff | comparison | revisions
multimedia/gstreamer/gstreamer.sh file | annotate | diff | comparison | revisions
multimedia/libbluray/libbluray.sh file | annotate | diff | comparison | revisions
multimedia/libdvdnav/libdvdnav.sh file | annotate | diff | comparison | revisions
multimedia/libdvdread/libdvdread.sh file | annotate | diff | comparison | revisions
multimedia/libtheora/libtheora.sh file | annotate | diff | comparison | revisions
multimedia/openh264/openh264.sh file | annotate | diff | comparison | revisions
multimedia/x264/x264.sh file | annotate | diff | comparison | revisions
multimedia/x265/x265.sh file | annotate | diff | comparison | revisions
network/curl/curl.sh file | annotate | diff | comparison | revisions
network/inetutils/inetutils.sh file | annotate | diff | comparison | revisions
network/ipcalc/ipcalc.sh file | annotate | diff | comparison | revisions
network/iproute2/iproute2.sh file | annotate | diff | comparison | revisions
network/iputils/iputils.sh file | annotate | diff | comparison | revisions
network/libpsl/libpsl.sh file | annotate | diff | comparison | revisions
network/libsoup/libsoup.sh file | annotate | diff | comparison | revisions
network/libssh/libssh.sh file | annotate | diff | comparison | revisions
network/libssh2/libssh2.sh file | annotate | diff | comparison | revisions
network/nghttp2/nghttp2.sh file | annotate | diff | comparison | revisions
network/ntp/ntp.sh file | annotate | diff | comparison | revisions
network/openssh/openssh.sh file | annotate | diff | comparison | revisions
network/sdl2-net/sdl2-net.sh file | annotate | diff | comparison | revisions
network/uriparser/uriparser.sh file | annotate | diff | comparison | revisions
network/wget/wget.sh file | annotate | diff | comparison | revisions
network/wireless-tools/wireless-tools.sh file | annotate | diff | comparison | revisions
network/wpa-supplicant/wpa-supplicant.sh file | annotate | diff | comparison | revisions
perl/p5-locale-gettext/p5-locale-gettext.sh file | annotate | diff | comparison | revisions
perl/p5-uri/p5-uri.sh file | annotate | diff | comparison | revisions
perl/p5-xml-namespacesupport/p5-xml-namespacesupport.sh file | annotate | diff | comparison | revisions
perl/p5-xml-parser/p5-xml-parser.sh file | annotate | diff | comparison | revisions
perl/p5-xml-sax-base/p5-xml-sax-base.sh file | annotate | diff | comparison | revisions
perl/p5-xml-sax-expat/p5-xml-sax-expat.sh file | annotate | diff | comparison | revisions
perl/p5-xml-sax/p5-xml-sax.sh file | annotate | diff | comparison | revisions
perl/p5-xml-simple/p5-xml-simple.sh file | annotate | diff | comparison | revisions
perl/perl/perl.sh file | annotate | diff | comparison | revisions
print/cups/cups.sh file | annotate | diff | comparison | revisions
python/py-ansicolor/py-ansicolor.sh file | annotate | diff | comparison | revisions
python/py-commonmark/py-commonmark.sh file | annotate | diff | comparison | revisions
python/py-daemon/py-daemon.sh file | annotate | diff | comparison | revisions
python/py-dateutil/py-dateutil.sh file | annotate | diff | comparison | revisions
python/py-docker/py-docker.sh file | annotate | diff | comparison | revisions
python/py-docutils/py-docutils.sh file | annotate | diff | comparison | revisions
python/py-editorconfig/py-editorconfig.sh file | annotate | diff | comparison | revisions
python/py-isodate/py-isodate.sh file | annotate | diff | comparison | revisions
python/py-mako/py-mako.sh file | annotate | diff | comparison | revisions
python/py-pygments/py-pygments.sh file | annotate | diff | comparison | revisions
python/py-setuptools/py-setuptools.sh file | annotate | diff | comparison | revisions
python/python/python.sh file | annotate | diff | comparison | revisions
python/python2/python2.sh file | annotate | diff | comparison | revisions
qt/qt3d/qt3d.sh file | annotate | diff | comparison | revisions
qt/qtbase/qtbase.sh file | annotate | diff | comparison | revisions
qt/qtconnectivity/qtconnectivity.sh file | annotate | diff | comparison | revisions
qt/qtdeclarative/qtdeclarative.sh file | annotate | diff | comparison | revisions
qt/qtgamepad/qtgamepad.sh file | annotate | diff | comparison | revisions
qt/qtlocation/qtlocation.sh file | annotate | diff | comparison | revisions
qt/qtmultimedia/qtmultimedia.sh file | annotate | diff | comparison | revisions
qt/qtnetworkauth/qtnetworkauth.sh file | annotate | diff | comparison | revisions
qt/qtquickcontrols/qtquickcontrols.sh file | annotate | diff | comparison | revisions
qt/qtquickcontrols2/qtquickcontrols2.sh file | annotate | diff | comparison | revisions
qt/qtremoteobjects/qtremoteobjects.sh file | annotate | diff | comparison | revisions
qt/qtscript/qtscript.sh file | annotate | diff | comparison | revisions
qt/qtsensors/qtsensors.sh file | annotate | diff | comparison | revisions
qt/qtspeech/qtspeech.sh file | annotate | diff | comparison | revisions
qt/qttools/qttools.sh file | annotate | diff | comparison | revisions
qt/qtwayland/qtwayland.sh file | annotate | diff | comparison | revisions
qt/qtwebchannel/qtwebchannel.sh file | annotate | diff | comparison | revisions
qt/qtwebsockets/qtwebsockets.sh file | annotate | diff | comparison | revisions
qt/qtwebview/qtwebview.sh file | annotate | diff | comparison | revisions
qt/qtxmlpatterns/qtxmlpatterns.sh file | annotate | diff | comparison | revisions
ruby/ruby/ruby.sh file | annotate | diff | comparison | revisions
security/libsecret/libsecret.sh file | annotate | diff | comparison | revisions
security/linux-pam/linux-pam.sh file | annotate | diff | comparison | revisions
security/polkit/polkit.sh file | annotate | diff | comparison | revisions
security/shadow/shadow.sh file | annotate | diff | comparison | revisions
shells/bash/bash.sh file | annotate | diff | comparison | revisions
shells/dash/dash.sh file | annotate | diff | comparison | revisions
shells/zsh/zsh.sh file | annotate | diff | comparison | revisions
system/accountsservice/accountsservice.sh file | annotate | diff | comparison | revisions
system/rsync/rsync.sh file | annotate | diff | comparison | revisions
system/upower/upower.sh file | annotate | diff | comparison | revisions
terminals/xterm/xterm.sh file | annotate | diff | comparison | revisions
text/aspell-af/aspell-af.sh file | annotate | diff | comparison | revisions
text/aspell-am/aspell-am.sh file | annotate | diff | comparison | revisions
text/aspell-ar/aspell-ar.sh file | annotate | diff | comparison | revisions
text/aspell-ast/aspell-ast.sh file | annotate | diff | comparison | revisions
text/aspell-az/aspell-az.sh file | annotate | diff | comparison | revisions
text/aspell-be/aspell-be.sh file | annotate | diff | comparison | revisions
text/aspell-bg/aspell-bg.sh file | annotate | diff | comparison | revisions
text/aspell-bn/aspell-bn.sh file | annotate | diff | comparison | revisions
text/aspell-br/aspell-br.sh file | annotate | diff | comparison | revisions
text/aspell-ca/aspell-ca.sh file | annotate | diff | comparison | revisions
text/aspell-cs/aspell-cs.sh file | annotate | diff | comparison | revisions
text/aspell-csb/aspell-csb.sh file | annotate | diff | comparison | revisions
text/aspell-cy/aspell-cy.sh file | annotate | diff | comparison | revisions
text/aspell-da/aspell-da.sh file | annotate | diff | comparison | revisions
text/aspell-de/aspell-de.sh file | annotate | diff | comparison | revisions
text/aspell-el/aspell-el.sh file | annotate | diff | comparison | revisions
text/aspell-en/aspell-en.sh file | annotate | diff | comparison | revisions
text/aspell-eo/aspell-eo.sh file | annotate | diff | comparison | revisions
text/aspell-es/aspell-es.sh file | annotate | diff | comparison | revisions
text/aspell-et/aspell-et.sh file | annotate | diff | comparison | revisions
text/aspell-fa/aspell-fa.sh file | annotate | diff | comparison | revisions
text/aspell-fi/aspell-fi.sh file | annotate | diff | comparison | revisions
text/aspell-fo/aspell-fo.sh file | annotate | diff | comparison | revisions
text/aspell-fr/aspell-fr.sh file | annotate | diff | comparison | revisions
text/aspell-fy/aspell-fy.sh file | annotate | diff | comparison | revisions
text/aspell-ga/aspell-ga.sh file | annotate | diff | comparison | revisions
text/aspell-gd/aspell-gd.sh file | annotate | diff | comparison | revisions
text/aspell-gl/aspell-gl.sh file | annotate | diff | comparison | revisions
text/aspell-grc/aspell-grc.sh file | annotate | diff | comparison | revisions
text/aspell-gu/aspell-gu.sh file | annotate | diff | comparison | revisions
text/aspell-gv/aspell-gv.sh file | annotate | diff | comparison | revisions
text/aspell-he/aspell-he.sh file | annotate | diff | comparison | revisions
text/aspell-hi/aspell-hi.sh file | annotate | diff | comparison | revisions
text/aspell-hil/aspell-hil.sh file | annotate | diff | comparison | revisions
text/aspell-hr/aspell-hr.sh file | annotate | diff | comparison | revisions
text/aspell-hsb/aspell-hsb.sh file | annotate | diff | comparison | revisions
text/aspell-hu/aspell-hu.sh file | annotate | diff | comparison | revisions
text/aspell-hus/aspell-hus.sh file | annotate | diff | comparison | revisions
text/aspell-hy/aspell-hy.sh file | annotate | diff | comparison | revisions
text/aspell-ia/aspell-ia.sh file | annotate | diff | comparison | revisions
text/aspell-id/aspell-id.sh file | annotate | diff | comparison | revisions
text/aspell-is/aspell-is.sh file | annotate | diff | comparison | revisions
text/aspell-it/aspell-it.sh file | annotate | diff | comparison | revisions
text/aspell-kn/aspell-kn.sh file | annotate | diff | comparison | revisions
text/aspell-ku/aspell-ku.sh file | annotate | diff | comparison | revisions
text/aspell-ky/aspell-ky.sh file | annotate | diff | comparison | revisions
text/aspell-la/aspell-la.sh file | annotate | diff | comparison | revisions
text/aspell-lt/aspell-lt.sh file | annotate | diff | comparison | revisions
text/aspell-lv/aspell-lv.sh file | annotate | diff | comparison | revisions
text/aspell-mg/aspell-mg.sh file | annotate | diff | comparison | revisions
text/aspell-mi/aspell-mi.sh file | annotate | diff | comparison | revisions
text/aspell-mk/aspell-mk.sh file | annotate | diff | comparison | revisions
text/aspell-ml/aspell-ml.sh file | annotate | diff | comparison | revisions
text/aspell-mn/aspell-mn.sh file | annotate | diff | comparison | revisions
text/aspell-mr/aspell-mr.sh file | annotate | diff | comparison | revisions
text/aspell-ms/aspell-ms.sh file | annotate | diff | comparison | revisions
text/aspell-mt/aspell-mt.sh file | annotate | diff | comparison | revisions
text/aspell-nb/aspell-nb.sh file | annotate | diff | comparison | revisions
text/aspell-nds/aspell-nds.sh file | annotate | diff | comparison | revisions
text/aspell-nl/aspell-nl.sh file | annotate | diff | comparison | revisions
text/aspell-nn/aspell-nn.sh file | annotate | diff | comparison | revisions
text/aspell-ny/aspell-ny.sh file | annotate | diff | comparison | revisions
text/aspell-or/aspell-or.sh file | annotate | diff | comparison | revisions
text/aspell-pa/aspell-pa.sh file | annotate | diff | comparison | revisions
text/aspell-pl/aspell-pl.sh file | annotate | diff | comparison | revisions
text/aspell-pt/aspell-pt.sh file | annotate | diff | comparison | revisions
text/aspell-qu/aspell-qu.sh file | annotate | diff | comparison | revisions
text/aspell-ro/aspell-ro.sh file | annotate | diff | comparison | revisions
text/aspell-ru/aspell-ru.sh file | annotate | diff | comparison | revisions
text/aspell-rw/aspell-rw.sh file | annotate | diff | comparison | revisions
text/aspell-sc/aspell-sc.sh file | annotate | diff | comparison | revisions
text/aspell-sk/aspell-sk.sh file | annotate | diff | comparison | revisions
text/aspell-sl/aspell-sl.sh file | annotate | diff | comparison | revisions
text/aspell-sr/aspell-sr.sh file | annotate | diff | comparison | revisions
text/aspell-sv/aspell-sv.sh file | annotate | diff | comparison | revisions
text/aspell-sw/aspell-sw.sh file | annotate | diff | comparison | revisions
text/aspell-ta/aspell-ta.sh file | annotate | diff | comparison | revisions
text/aspell-te/aspell-te.sh file | annotate | diff | comparison | revisions
text/aspell-tet/aspell-tet.sh file | annotate | diff | comparison | revisions
text/aspell-tk/aspell-tk.sh file | annotate | diff | comparison | revisions
text/aspell-tl/aspell-tl.sh file | annotate | diff | comparison | revisions
text/aspell-tn/aspell-tn.sh file | annotate | diff | comparison | revisions
text/aspell-tr/aspell-tr.sh file | annotate | diff | comparison | revisions
text/aspell-uk/aspell-uk.sh file | annotate | diff | comparison | revisions
text/aspell-uz/aspell-uz.sh file | annotate | diff | comparison | revisions
text/aspell-vi/aspell-vi.sh file | annotate | diff | comparison | revisions
text/aspell-wa/aspell-wa.sh file | annotate | diff | comparison | revisions
text/aspell-yi/aspell-yi.sh file | annotate | diff | comparison | revisions
text/aspell-zu/aspell-zu.sh file | annotate | diff | comparison | revisions
text/aspell/aspell.sh file | annotate | diff | comparison | revisions
text/docbook-xml/docbook-xml.sh file | annotate | diff | comparison | revisions
text/hunspell/hunspell.sh file | annotate | diff | comparison | revisions
text/json-glib/json-glib.sh file | annotate | diff | comparison | revisions
text/libcroco/libcroco.sh file | annotate | diff | comparison | revisions
text/libxml2/libxml2.sh file | annotate | diff | comparison | revisions
text/libxslt/libxslt.sh file | annotate | diff | comparison | revisions
text/xmlto/xmlto.sh file | annotate | diff | comparison | revisions
www/midori/midori.sh file | annotate | diff | comparison | revisions
www/webkitgtk/webkitgtk.sh file | annotate | diff | comparison | revisions
x11/appres/appres.sh file | annotate | diff | comparison | revisions
x11/bdftopcf/bdftopcf.sh file | annotate | diff | comparison | revisions
x11/bitmap/bitmap.sh file | annotate | diff | comparison | revisions
x11/font-util/font-util.sh file | annotate | diff | comparison | revisions
x11/iceauth/iceauth.sh file | annotate | diff | comparison | revisions
x11/imake/imake.sh file | annotate | diff | comparison | revisions
x11/libdmx/libdmx.sh file | annotate | diff | comparison | revisions
x11/libfontenc/libfontenc.sh file | annotate | diff | comparison | revisions
x11/libfs/libfs.sh file | annotate | diff | comparison | revisions
x11/libice/libice.sh file | annotate | diff | comparison | revisions
x11/libpciaccess/libpciaccess.sh file | annotate | diff | comparison | revisions
x11/libsm/libsm.sh file | annotate | diff | comparison | revisions
x11/libx11/libx11.sh file | annotate | diff | comparison | revisions
x11/libxau/libxau.sh file | annotate | diff | comparison | revisions
x11/libxaw/libxaw.sh file | annotate | diff | comparison | revisions
x11/libxcb/libxcb.sh file | annotate | diff | comparison | revisions
x11/libxcomposite/libxcomposite.sh file | annotate | diff | comparison | revisions
x11/libxcursor/libxcursor.sh file | annotate | diff | comparison | revisions
x11/libxdamage/libxdamage.sh file | annotate | diff | comparison | revisions
x11/libxdmcp/libxdmcp.sh file | annotate | diff | comparison | revisions
x11/libxext/libxext.sh file | annotate | diff | comparison | revisions
x11/libxfixes/libxfixes.sh file | annotate | diff | comparison | revisions
x11/libxfont2/libxfont2.sh file | annotate | diff | comparison | revisions
x11/libxft/libxft.sh file | annotate | diff | comparison | revisions
x11/libxi/libxi.sh file | annotate | diff | comparison | revisions
x11/libxinerama/libxinerama.sh file | annotate | diff | comparison | revisions
x11/libxkbfile/libxkbfile.sh file | annotate | diff | comparison | revisions
x11/libxmu/libxmu.sh file | annotate | diff | comparison | revisions
x11/libxpm/libxpm.sh file | annotate | diff | comparison | revisions
x11/libxpresent/libxpresent.sh file | annotate | diff | comparison | revisions
x11/libxrandr/libxrandr.sh file | annotate | diff | comparison | revisions
x11/libxrender/libxrender.sh file | annotate | diff | comparison | revisions
x11/libxres/libxres.sh file | annotate | diff | comparison | revisions
x11/libxscrnsaver/libxscrnsaver.sh file | annotate | diff | comparison | revisions
x11/libxshmfence/libxshmfence.sh file | annotate | diff | comparison | revisions
x11/libxt/libxt.sh file | annotate | diff | comparison | revisions
x11/libxtrap/libxtrap.sh file | annotate | diff | comparison | revisions
x11/libxtst/libxtst.sh file | annotate | diff | comparison | revisions
x11/libxv/libxv.sh file | annotate | diff | comparison | revisions
x11/libxvmc/libxvmc.sh file | annotate | diff | comparison | revisions
x11/libxxf86dga/libxxf86dga.sh file | annotate | diff | comparison | revisions
x11/libxxf86misc/libxxf86misc.sh file | annotate | diff | comparison | revisions
x11/libxxf86vm/libxxf86vm.sh file | annotate | diff | comparison | revisions
x11/luit/luit.sh file | annotate | diff | comparison | revisions
x11/makedepend/makedepend.sh file | annotate | diff | comparison | revisions
x11/mkfontscale/mkfontscale.sh file | annotate | diff | comparison | revisions
x11/rendercheck/rendercheck.sh file | annotate | diff | comparison | revisions
x11/rgb/rgb.sh file | annotate | diff | comparison | revisions
x11/sessreg/sessreg.sh file | annotate | diff | comparison | revisions
x11/setxkbmap/setxkbmap.sh file | annotate | diff | comparison | revisions
x11/twm/twm.sh file | annotate | diff | comparison | revisions
x11/x11perf/x11perf.sh file | annotate | diff | comparison | revisions
x11/xauth/xauth.sh file | annotate | diff | comparison | revisions
x11/xbacklight/xbacklight.sh file | annotate | diff | comparison | revisions
x11/xbitmaps/xbitmaps.sh file | annotate | diff | comparison | revisions
x11/xcalc/xcalc.sh file | annotate | diff | comparison | revisions
x11/xcb-proto/xcb-proto.sh file | annotate | diff | comparison | revisions
x11/xcb-util-cursor/xcb-util-cursor.sh file | annotate | diff | comparison | revisions
x11/xcb-util-image/xcb-util-image.sh file | annotate | diff | comparison | revisions
x11/xcb-util-keysyms/xcb-util-keysyms.sh file | annotate | diff | comparison | revisions
x11/xcb-util-renderutil/xcb-util-renderutil.sh file | annotate | diff | comparison | revisions
x11/xcb-util-wm/xcb-util-wm.sh file | annotate | diff | comparison | revisions
x11/xclock/xclock.sh file | annotate | diff | comparison | revisions
x11/xcompmgr/xcompmgr.sh file | annotate | diff | comparison | revisions
x11/xcursorgen/xcursorgen.sh file | annotate | diff | comparison | revisions
x11/xdm/xdm.sh file | annotate | diff | comparison | revisions
x11/xdpyinfo/xdpyinfo.sh file | annotate | diff | comparison | revisions
x11/xdriinfo/xdriinfo.sh file | annotate | diff | comparison | revisions
x11/xev/xev.sh file | annotate | diff | comparison | revisions
x11/xf86-input-evdev/xf86-input-evdev.sh file | annotate | diff | comparison | revisions
x11/xf86-input-keyboard/xf86-input-keyboard.sh file | annotate | diff | comparison | revisions
x11/xf86-input-libinput/xf86-input-libinput.sh file | annotate | diff | comparison | revisions
x11/xf86-input-mouse/xf86-input-mouse.sh file | annotate | diff | comparison | revisions
x11/xf86-video-vesa/xf86-video-vesa.sh file | annotate | diff | comparison | revisions
x11/xfontsel/xfontsel.sh file | annotate | diff | comparison | revisions
x11/xgamma/xgamma.sh file | annotate | diff | comparison | revisions
x11/xhost/xhost.sh file | annotate | diff | comparison | revisions
x11/xinit/xinit.sh file | annotate | diff | comparison | revisions
x11/xinput/xinput.sh file | annotate | diff | comparison | revisions
x11/xkbcomp/xkbcomp.sh file | annotate | diff | comparison | revisions
x11/xkeyboard-config/xkeyboard-config.sh file | annotate | diff | comparison | revisions
x11/xkill/xkill.sh file | annotate | diff | comparison | revisions
x11/xlsfonts/xlsfonts.sh file | annotate | diff | comparison | revisions
x11/xmag/xmag.sh file | annotate | diff | comparison | revisions
x11/xmodmap/xmodmap.sh file | annotate | diff | comparison | revisions
x11/xorg-server/xorg-server.sh file | annotate | diff | comparison | revisions
x11/xorgproto/xorgproto.sh file | annotate | diff | comparison | revisions
x11/xprop/xprop.sh file | annotate | diff | comparison | revisions
x11/xrandr/xrandr.sh file | annotate | diff | comparison | revisions
x11/xrdb/xrdb.sh file | annotate | diff | comparison | revisions
x11/xset/xset.sh file | annotate | diff | comparison | revisions
x11/xsetroot/xsetroot.sh file | annotate | diff | comparison | revisions
x11/xtrans/xtrans.sh file | annotate | diff | comparison | revisions
x11/xvinfo/xvinfo.sh file | annotate | diff | comparison | revisions
x11/xwininfo/xwininfo.sh file | annotate | diff | comparison | revisions
xfce/exo/exo.sh file | annotate | diff | comparison | revisions
xfce/garcon/garcon.sh file | annotate | diff | comparison | revisions
xfce/libxfce4ui/libxfce4ui.sh file | annotate | diff | comparison | revisions
xfce/libxfce4util/libxfce4util.sh file | annotate | diff | comparison | revisions
xfce/mousepad/mousepad.sh file | annotate | diff | comparison | revisions
xfce/parole/parole.sh file | annotate | diff | comparison | revisions
xfce/ristretto/ristretto.sh file | annotate | diff | comparison | revisions
xfce/thunar-volman/thunar-volman.sh file | annotate | diff | comparison | revisions
xfce/thunar/thunar.sh file | annotate | diff | comparison | revisions
xfce/xfce4-appfinder/xfce4-appfinder.sh file | annotate | diff | comparison | revisions
xfce/xfce4-notifyd/xfce4-notifyd.sh file | annotate | diff | comparison | revisions
xfce/xfce4-panel/xfce4-panel.sh file | annotate | diff | comparison | revisions
xfce/xfce4-screensaver/xfce4-screensaver.sh file | annotate | diff | comparison | revisions
xfce/xfce4-screenshooter/xfce4-screenshooter.sh file | annotate | diff | comparison | revisions
xfce/xfce4-session/xfce4-session.sh file | annotate | diff | comparison | revisions
xfce/xfce4-settings/xfce4-settings.sh file | annotate | diff | comparison | revisions
xfce/xfce4-terminal/xfce4-terminal.sh file | annotate | diff | comparison | revisions
xfce/xfconf/xfconf.sh file | annotate | diff | comparison | revisions
xfce/xfdesktop/xfdesktop.sh file | annotate | diff | comparison | revisions
xfce/xfwm4/xfwm4.sh file | annotate | diff | comparison | revisions
--- a/CHANGES.md	Mon Aug 26 20:45:00 2019 +0200
+++ b/CHANGES.md	Mon Aug 26 12:14:53 2019 +0200
@@ -4,7 +4,13 @@
 Vanilla Linux current
 ------------------------------
 
-### 2018-08-12
+### 2019-08-28
+
+All dependencies are no longer specified with their full origins, this is
+because `vpk` and future `vpod` tool operate on a repository URL using source
+packages rather than the Mercurial repository.
+
+### 2019-08-12
 
 The Xfce desktop has been upgraded to 4.14, it no longer requires Gtk 2 and
 support for this toolkit has been explicitly disabled. For consistency purposes,
--- a/README.md	Mon Aug 26 20:45:00 2019 +0200
+++ b/README.md	Mon Aug 26 12:14:53 2019 +0200
@@ -4,6 +4,10 @@
 Welcome to the Vanilla Linux source tree. This directory contains scripts to
 build precompiled packages for Vanilla Linux.
 
+This source tree is usually only required for Vanilla Linux development, end
+users who just want to rebuild binary packages should use `vpk` and rebuild
+source package from the repository.
+
 Usage
 =====
 
@@ -17,7 +21,7 @@
 
 Then if build succeeded, you may install the package in /tmp/vpk/pkg.
 
-	$ vpk install /tmp/vpk/zlib*.txz
+	$ vpk add /tmp/vpk/zlib*.txz
 
 Options
 =======
@@ -29,36 +33,6 @@
 
 Example:
 
-    $ PULSEAUDIO=no vpk build
+	$ PULSEAUDIO=no vpk build
 
 Note: boolean options are set using *no* and *yes* (case sensitive).
-
-Categories
-==========
-
-Available package categories:
-
-- *audio*: everything related to audio from music player to editors
-- *core*: packages that are usually installed in a minimal system
-- *desktop*: miscellaneous desktop applications
-- *dev*: development, compilers and debuggers
-- *editors*: text file editors
-- *emulators*: game or machine emulators
-- *games*: games and toys
-- *haskell*: haskell packages and interpreters
-- *kde*: the plasma desktop
-- *lib*: packages with only libraries
-- *mate*: the mate desktop
-- *misc*: miscellaneous packages
-- *network*: network tools and applications
-- *office*: office suites and PIM
-- *perl*: perl packages and interpreters
-- *python*: python packages and interpreters
-- *ruby*: ruby packages and interpreters
-- *system*: system administration and tools
-- *tcl*: tcl packages and interpreters
-- *video*: video manipulation
-- *wm*: window managers
-- *www*: web libraries and tools
-- *xfce*: the XFCE desktop
-- *x11*: the X distribution
--- a/STYLE.md	Mon Aug 26 20:45:00 2019 +0200
+++ b/STYLE.md	Mon Aug 26 12:14:53 2019 +0200
@@ -23,6 +23,10 @@
 In shell programming try to stick with POSIX shell whenever possible. Otherwise,
 set the shebang to a different shell.
 
+Some extensions that are widely supported are allowed, all scripts must run with
+`busybox sh` and `dash`, also make sure that they do work with more popular
+shells like `bash` and `zsh`.
+
 Style
 -----
 
--- a/accessibility/at-spi2-atk/at-spi2-atk.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/accessibility/at-spi2-atk/at-spi2-atk.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="GTK bridge for ATK to D-Bus at-spi"
 PKGDOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/$PKGNAME/2.32/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="accessibility/atk accessibility/at-spi2-core dev/meson:build"
+PKGDEPENDS="atk at-spi2-core meson:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/accessibility/at-spi2-core/at-spi2-core.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/accessibility/at-spi2-core/at-spi2-core.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="core definitions for at-spi"
 PKGDOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/$PKGNAME/2.32/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build"
+PKGDEPENDS="meson:build"
 PKGOPTIONS="X"
 
 : ${CC:=clang}
@@ -32,7 +32,7 @@
 : ${X:=yes}
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libx11 x11/libxtst x11/libxi $PKGDEPENDS"
+	PKGDEPENDS="libx11 libxtst libxi $PKGDEPENDS"
 	with_x="-D x11=true"
 else
 	with_x="-D x11=false"
--- a/accessibility/atk/atk.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/accessibility/atk/atk.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="accessibility toolkit"
 PKGDOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/$PKGNAME/2.32/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build"
+PKGDEPENDS="meson:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/audio/cdparanoia/cdparanoia.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/cdparanoia/cdparanoia.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+ LGPLv21+"
 PKGSUMMARY="library and tool to extract data from an audio CD"
 PKGDOWNLOAD="http://downloads.xiph.org/releases/$PKGNAME/$PKGNAME-III-$PKGVERSION.src.tgz"
-PKGDEPENDS="lib/linux-headers:build"
+PKGDEPENDS="linux-headers:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/audio/flac/flac.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/flac/flac.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -36,14 +36,14 @@
 : ${OGG:=yes}
 
 if [ "$DOXYGEN" = "yes" ]; then
-	PKGDEPENDS="dev/doxygen:build $PKGDEPENDS"
+	PKGDEPENDS="doxygen:build $PKGDEPENDS"
 	with_doxygen="--enable-doxygen-docs"
 else
 	with_doxygen="--disable-doxygen-docs"
 fi
 
 if [ "$OGG" = "yes" ]; then
-	PKGDEPENDS="audio/libogg $PKGDEPENDS"
+	PKGDEPENDS="libogg $PKGDEPENDS"
 	with_ogg="--enable-ogg"
 else
 	with_ogg="--disable-ogg"
--- a/audio/jack2/jack2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/jack2/jack2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -39,42 +39,42 @@
 : ${SNDFILE:=yes}
 
 if [ "$ALSA" = "yes" ]; then
-	PKGDEPENDS="audio/alsa-lib $PKGDEPENDS"
+	PKGDEPENDS="alsa-lib $PKGDEPENDS"
 	with_alsa="--alsa=yes"
 else
 	with_alsa="--alsa=no"
 fi
 
 if [ "$DBUS" = "yes" ]; then
-	PKGDEPENDS="network/dbus $PKGDEPENDS"
+	PKGDEPENDS="dbus $PKGDEPENDS"
 	with_dbus="--dbus"
 else
 	with_dbus="--dbus"
 fi
 
 if [ "$OPUS" = "yes" ]; then
-	PKGDEPENDS="audio/opus $PKGDEPENDS"
+	PKGDEPENDS="opus $PKGDEPENDS"
 	with_opus="--opus=yes"
 else
 	with_opus="--opus=no"
 fi
 
 if [ "$DOXYGEN" = "yes" ]; then
-	PKGDEPENDS="dev/doxygen:build $PKGDEPENDS"
+	PKGDEPENDS="doxygen:build $PKGDEPENDS"
 	with_doxygen="--doxygen=yes"
 else
 	with_doxygen="--doxygen=no"
 fi
 
 if [ "$READLINE" = "yes" ]; then
-	PKGDEPENDS="lib/readline $PKGDEPENDS"
+	PKGDEPENDS="readline $PKGDEPENDS"
 	with_readline="--readline=yes"
 else
 	with_readline="--readline=no"
 fi
 
 if [ "$SNDFILE" = "yes" ]; then
-	PKGDEPENDS="audio/libsndfile $PKGDEPENDS"
+	PKGDEPENDS="libsndfile $PKGDEPENDS"
 	with_sndfile="--sndfile=yes"
 else
 	with_sndfile="--sndfile=no"
--- a/audio/lame/lame.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/lame/lame.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="MP3 encoder and frame analyzer"
 PKGDOWNLOAD="https://downloads.sourceforge.net/project/$PKGNAME/$PKGNAME/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/nasm:build"
+PKGDEPENDS="nasm:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/audio/libcanberra/libcanberra.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/libcanberra/libcanberra.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -33,28 +33,28 @@
 : ${UDEV:=yes}
 
 if [ "$ALSA" = "yes" ]; then
-	PKGDEPENDS="audio/alsa-lib $PKGDEPENDS"
+	PKGDEPENDS="alsa-lib $PKGDEPENDS"
 	with_alsa="--enable-alsa"
 else
 	with_alsa="--disable-alsa"
 fi
 
 if [ "$GTK" = "yes" ]; then
-	PKGDEPENDS="graphics/gtk $PKGDEPENDS"
+	PKGDEPENDS="gtk $PKGDEPENDS"
 	with_gtk="--enable-gtk3"
 else
 	with_gtk="--disable-gtk3"
 fi
 
 if [ "$PULSEAUDIO" = "yes" ]; then
-	PKGDEPENDS="audio/pulseaudio $PKGDEPENDS"
+	PKGDEPENDS="pulseaudio $PKGDEPENDS"
 	with_pulseaudio="--enable-pulse"
 else
 	with_pulseaudio="--disable-pulse"
 fi
 
 if [ "$UDEV" = "yes" ]; then
-	PKGDEPENDS="core/eudev $PKGDEPENDS"
+	PKGDEPENDS="eudev $PKGDEPENDS"
 	with_udev="--enable-udev"
 else
 	with_udev="--disable-udev"
--- a/audio/libsndfile/libsndfile.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/libsndfile/libsndfile.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21 GPLv3"
 PKGSUMMARY="C library for loading sampled sound files"
 PKGDOWNLOAD="http://www.mega-nerd.com/$PKGNAME/files/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="audio/libvorbis audio/flac"
+PKGDEPENDS="libvorbis flac"
 PKGOPTIONS="ALSA"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${ALSA:=yes}
 
 if [ "$ALSA" = "yes" ]; then
-	PKGDEPENDS="audio/alsa-lib $PKGDEPENDS"
+	PKGDEPENDS="alsa-lib $PKGDEPENDS"
 	with_alsa="--enable-alsa"
 else
 	with_alsa="--disable-alsa"
--- a/audio/libvorbis/libvorbis.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/libvorbis/libvorbis.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="vorbis codec library"
 PKGDOWNLOAD="http://downloads.xiph.org/releases/vorbis/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="audio/libogg"
+PKGDEPENDS="libogg"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/audio/mpg123/mpg123.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/mpg123/mpg123.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -38,7 +38,7 @@
 : ${PULSEAUDIO:=yes}
 
 if [ "$ALSA" = "yes" ]; then
-	PKGDEPENDS="audio/alsa-lib $PKGDEPENDS"
+	PKGDEPENDS="alsa-lib $PKGDEPENDS"
 	with_audio="alsa"
 fi
 
@@ -52,7 +52,7 @@
 fi
 
 if [ "$PULSEAUDIO" = "yes" ]; then
-	PKGDEPENDS="audio/pulseaudio $PKGDEPENDS"
+	PKGDEPENDS="pulseaudio $PKGDEPENDS"
 	with_audio="pulse $with_audio"
 fi
 
--- a/audio/openal-soft/openal-soft.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/openal-soft/openal-soft.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="implementation of OpenAL 3D sound API"
 PKGDOWNLOAD="https://openal-soft.org/openal-releases/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="dev/cmake:build"
+PKGDEPENDS="cmake:build"
 PKGOPTIONS="ALSA EXAMPLES JACK OSS PULSEAUDIO SDL2 UTILS"
 
 : ${CC:=clang}
@@ -37,14 +37,14 @@
 : ${UTILS:=yes}
 
 if [ "$ALSA" = "yes" ]; then
-	PKGDEPENDS="audio/alsa-lib $PKGDEPENDS"
+	PKGDEPENDS="alsa-lib $PKGDEPENDS"
 	with_alsa="-DALSOFT_REQUIRE_ALSA=On"
 else
 	with_alsa="-DALSOFT_REQUIRE_ALSA=Off"
 fi
 
 if [ "$EXAMPLES" = "yes" ]; then
-	PKGDEPENDS="lib/sdl2 audio/ffmpeg $PKGDEPENDS"
+	PKGDEPENDS="sdl2 audio/ffmpeg $PKGDEPENDS"
 	with_examples="-DALSOFT_EXAMPLES=On"
 else
 	with_examples="-DALSOFT_EXAMPLES=Off"
@@ -64,16 +64,16 @@
 fi
 
 if [ "$PULSEAUDIO" = "yes" ]; then
-	PKGDEPENDS="audio/pulseaudio $PKGDEPENDS"
+	PKGDEPENDS="pulseaudio $PKGDEPENDS"
 	with_pulseaudio="-DALSOFT_REQUIRE_PULSEAUDIO=On"
 else
 	with_pulseaudio="-DALSOFT_REQUIRE_PULSEAUDIO=Off"
 fi
 
 if [ "$SDL2" = "yes" ]; then
-	# Don't register lib/sdl2 twice.
+	# Don't register sdl2 twice.
 	if [ "$EXAMPLES" != "yes" ]; then
-		PKGDEPENDS="lib/sdl2 $PKGDEPENDS"
+		PKGDEPENDS="sdl2 $PKGDEPENDS"
 	fi
 
 	with_sdl2="-DALSOFT_REQUIRE_SDL2=On"
@@ -82,7 +82,7 @@
 fi
 
 if [ "$UTILS" = "yes" ]; then
-	PKGDEPENDS="qt/qtbase $PKGDEPENDS"
+	PKGDEPENDS="qtbase $PKGDEPENDS"
 	with_utils="-DALSOFT_UTILS=On"
 else
 	with_utils="-DALSOFT_UTILS=Off"
--- a/audio/pulseaudio/pulseaudio.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/pulseaudio/pulseaudio.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -44,7 +44,7 @@
 : ${X:=yes}
 
 if [ "$ALSA" = "yes" ]; then
-	PKGDEPENDS="audio/alsa-lib $PKGDEPENDS"
+	PKGDEPENDS="alsa-lib $PKGDEPENDS"
 	with_alsa="--enable-alsa"
 else
 	with_alsa="--disable-alsa"
@@ -58,14 +58,14 @@
 fi
 
 if [ "$BLUETOOTH" = "yes" ]; then
-	PKGDEPENDS="bluetooth/bluez $PKGDEPENDS"
+	PKGDEPENDS="bluez $PKGDEPENDS"
 	with_bluetooth="--enable-bluez5"
 else
 	with_bluetooth="--disable-bluez5"
 fi
 
 if [ "$GTK" = "yes" ]; then
-	PKGDEPENDS="graphics/gtk accessibility/at-spi2-atk $PKGDEPENDS"
+	PKGDEPENDS="gtk at-spi2-atk $PKGDEPENDS"
 	with_gtk="--enable-gtk3"
 else
 	with_gtk="--disable-gtk3"
@@ -85,7 +85,7 @@
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
@@ -105,14 +105,14 @@
 fi
 
 if [ "$UDEV" = "yes" ]; then
-	PKGDEPENDS="core/eudev $PKGDEPENDS"
+	PKGDEPENDS="eudev $PKGDEPENDS"
 	with_udev="--enable-udev"
 else
 	with_udev="--disable-udev"
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libx11 x11/libxcb x11/libice x11/libsm x11/libxtst"
+	PKGDEPENDS="libx11 libxcb libice libsm libxtst"
 	with_x="--enable-x11"
 else
 	with_x="--disable-x11"
--- a/audio/sdl2-mixer/sdl2-mixer.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/sdl2-mixer/sdl2-mixer.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -23,7 +23,7 @@
 PKGLICENSE="zlib"
 PKGSUMMARY="sound addon for SDL2"
 PKGDOWNLOAD="https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/sdl2"
+PKGDEPENDS="sdl2"
 PKGOPTIONS="FLAC OGG OPUS WAVE"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -38,14 +38,14 @@
 : ${WAVE:=yes}
 
 if [ "$FLAC" = "yes" ]; then
-	PKGDEPENDS="audio/flac $PKGDEPENDS"
+	PKGDEPENDS="flac $PKGDEPENDS"
 	with_flac="--enable-music-flac"
 else
 	with_flac="--disable-music-flac"
 fi
 
 if [ "$OPUS" = "yes" ]; then
-	PKGDEPENDS="audio/opus $PKGDEPENDS"
+	PKGDEPENDS="opus $PKGDEPENDS"
 	with_opus="--enable-music-opus"
 else
 	with_opus="--disable-music-opus"
--- a/audio/speex/speex.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/speex/speex.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="audio codec for free speech"
 PKGDOWNLOAD="http://downloads.us.xiph.org/releases/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="audio/libogg"
+PKGDEPENDS="libogg"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/audio/taglib/taglib.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/audio/taglib/taglib.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21 MPL"
 PKGSUMMARY="library for reading and editing metadata in audio files"
 PKGDOWNLOAD="https://taglib.org/releases/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/cmake:build"
+PKGDEPENDS="cmake:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/bluetooth/bluez/bluez.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/bluetooth/bluez/bluez.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -58,7 +58,7 @@
 fi
 
 if [ "$UDEV" = "yes" ]; then
-	PKGDEPENDS="core/eudev $PKGDEPENDS"
+	PKGDEPENDS="eudev $PKGDEPENDS"
 	with_udev="--enable-udev"
 else
 	with_udev="--disable-udev"
--- a/compression/libarchive/libarchive.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/compression/libarchive/libarchive.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -42,42 +42,42 @@
 : ${ZSTD:=yes}
 
 if [ "$ACL" = "yes" ]; then
-	PKGDEPENDS="core/acl $PKGDEPENDS"
+	PKGDEPENDS="acl $PKGDEPENDS"
 	with_acl="--enable-acl"
 else
 	with_acl="--disable-acl"
 fi
 
 if [ "$BZIP2" = "yes" ]; then
-	PKGDEPENDS="compression/bzip2 $PKGDEPENDS"
+	PKGDEPENDS="bzip2 $PKGDEPENDS"
 	with_bzip2="--with-bz2lib"
 else
 	with_bzip2="--without-bz2lib"
 fi
 
 if [ "$XML" = "yes" ]; then
-	PKGDEPENDS="lib/expat $PKGDEPENDS"
+	PKGDEPENDS="expat $PKGDEPENDS"
 	with_expat="--with-expat"
 else
 	with_expat="--without-expat"
 fi
 
 if [ "$LZ4" = "yes" ]; then
-	PKGDEPENDS="compression/lz4 $PKGDEPENDS"
+	PKGDEPENDS="lz4 $PKGDEPENDS"
 	with_lz4="--with-lz4"
 else
 	with_lz4="--without-lz4"
 fi
 
 if [ "$LZMA" = "yes" ]; then
-	PKGDEPENDS="compression/xz $PKGDEPENDS"
+	PKGDEPENDS="xz $PKGDEPENDS"
 	with_lzma="--with-lzma"
 else
 	with_lzma="--without-lzma"
 fi
 
 if [ "$LZO" = "yes" ]; then
-	PKGDEPENDS="lib/lzo $PKGDEPENDS"
+	PKGDEPENDS="lzo $PKGDEPENDS"
 	with_lzo="--with-lzo2"
 else
 	with_lzo="--without-lzo2"
@@ -91,14 +91,14 @@
 fi
 
 if [ "$SSL" = "yes" ]; then
-	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
+	PKGDEPENDS="libressl $PKGDEPENDS"
 	with_ssl="--with-openssl"
 else
 	with_ssl="--without-openssl"
 fi
 
 if [ "$ZSTD" = "yes" ]; then
-	PKGDEPENDS="compression/zstd $PKGDEPENDS"
+	PKGDEPENDS="zstd $PKGDEPENDS"
 	with_zstd="--with-zstd"
 else
 	with_zstd="--without-zstd"
--- a/compression/libzip/libzip.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/compression/libzip/libzip.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="zip library in C"
 PKGDOWNLOAD="https://libzip.org/download/libzip-1.5.1.tar.xz"
-PKGDEPENDS="dev/cmake compression/zlib lib/musl-fts:build"
+PKGDEPENDS="cmake zlib musl-fts:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/compression/msgpack/msgpack.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/compression/msgpack/msgpack.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BOOSTv10"
 PKGSUMMARY="msgpack implementation for C and C++"
 PKGDOWNLOAD="https://github.com/msgpack/msgpack-c/releases/download/cpp-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/cmake:build"
+PKGDEPENDS="cmake:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/compression/unzip/unzip.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/compression/unzip/unzip.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="utility to decompress zip files"
 PKGDOWNLOAD="https://downloads.sourceforge.net/infozip/${PKGNAME}60.tar.gz"
-PKGDEPENDS="compression/bzip2"
+PKGDEPENDS="bzip2"
 
 : ${CC:=clang}
 
--- a/compression/xz/xz.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/compression/xz/xz.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${NLS:=yes}
 
 if [ "${NLS:-yes}" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/compression/zip/zip.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/compression/zip/zip.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="utility to compress and archive zip files"
 PKGDOWNLOAD="https://downloads.sourceforge.net/infozip/${PKGNAME}30.tar.gz"
-PKGDEPENDS="compression/bzip2"
+PKGDEPENDS="bzip2"
 
 : ${CC:=clang}
 
--- a/core/acl/acl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/acl/acl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="ACL utilities and libraries"
 PKGDOWNLOAD="http://download.savannah.nongnu.org/releases/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="core/attr"
+PKGDEPENDS="attr"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/attr/attr.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/attr/attr.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/bash-completion/bash-completion.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/bash-completion/bash-completion.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="programmable completion functions for bash"
 PKGDOWNLOAD="https://github.com/scop/$PKGNAME/releases/download/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="shells/bash"
+PKGDEPENDS="bash"
 
 build()
 {
--- a/core/bc/bc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/bc/bc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3+"
 PKGSUMMARY="GNU arbitrary precision numeric processing language"
 PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="core/ed core/texinfo lib/readline"
+PKGDEPENDS="ed texinfo readline"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/core/busybox/busybox.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/busybox/busybox.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="swiss army knife for embedded"
 PKGDOWNLOAD="https://busybox.net/downloads/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="lib/linux-headers:build"
+PKGDEPENDS="linux-headers:build"
 PKGOPTIONS="CONFIG IPV6 PAM SELINUX"
 PKGPROTECT="etc/udhcpd.conf"
 
--- a/core/consolekit2/consolekit2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/consolekit2/consolekit2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="framework for defining and tracking user sessions"
 PKGDOWNLOAD="https://github.com/ConsoleKit2/ConsoleKit2/releases/download/$PKGVERSION/ConsoleKit2-$PKGVERSION.tar.bz2"
-PKGDEPENDS="network/dbus lib/glib x11/libx11"
+PKGDEPENDS="dbus glib libx11"
 PKGOPTIONS="PAM POLKIT SELINUX UDEV"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -36,14 +36,14 @@
 : ${UDEV:=yes}
 
 if [ "$PAM" = "yes" ]; then
-	PKGDEPENDS="security/linux-pam $PKGDEPENDS"
+	PKGDEPENDS="linux-pam $PKGDEPENDS"
 	with_pam="--enable-pam-module --with-pam-module-dir=/lib/security"
 else
 	with_pam="--disable-pam-module"
 fi
 
 if [ "$POLKIT" = "yes" ]; then
-	PKGDEPENDS="security/polkit $PKGDEPENDS"
+	PKGDEPENDS="polkit $PKGDEPENDS"
 	with_polkit="--enable-polkit"
 else
 	with_polkit="--disable-polkit"
@@ -56,7 +56,7 @@
 fi
 
 if [ "$UDEV" = "yes" ]; then
-	PKGDEPENDS="core/eudev $PKGDEPENDS"
+	PKGDEPENDS="eudev $PKGDEPENDS"
 	with_udev="--enable-libudev"
 else
 	with_udev="--disable-libudev"
--- a/core/coreutils/coreutils.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/coreutils/coreutils.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -34,19 +34,19 @@
 : ${SSL:=yes}
 
 if [ "$GMP" = "yes" ]; then
-	PKGDEPENDS="lib/gmp $PKGDEPENDS"
+	PKGDEPENDS="gmp $PKGDEPENDS"
 	with_gmp="--with-gmp"
 else
 	with_gmp="--without-gmp"
 fi
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
 fi
 if [ "$SSL" = "yes" ]; then
-	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
+	PKGDEPENDS="libressl $PKGDEPENDS"
 	with_ssl="--with-openssl"
 else
 	with_ssl="--with-openssl"
--- a/core/cpio/cpio.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/cpio/cpio.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/diffutils/diffutils.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/diffutils/diffutils.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/e2fsprogs/e2fsprogs.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/e2fsprogs/e2fsprogs.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+ LGPLv20 BSD3CLAUSE MIT"
 PKGSUMMARY="ext2/3/4 filesystem utilities"
 PKGDOWNLOAD="https://sourceforge.net/projects/e2fsprogs/files/$PKGNAME/v$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="core/util-linux"
+PKGDEPENDS="util-linux"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/efibootmgr/efibootmgr.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/efibootmgr/efibootmgr.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="application to manipulate UEFI"
 PKGDOWNLOAD="https://github.com/rhboot/$PKGNAME/archive/$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/efivar lib/popt"
+PKGDEPENDS="efivar popt"
 
 : ${CC:=clang}
 
--- a/core/elfutils/elfutils.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/elfutils/elfutils.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+ GPLv3+ LGPLv3+"
 PKGSUMMARY="utilities to inspect ELF files"
 PKGDOWNLOAD="https://sourceware.org/$PKGNAME/ftp/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="compression/zlib lib/musl-fts lib/musl-obstack"
+PKGDEPENDS="zlib musl-fts musl-obstack"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/core/eudev/eudev.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/eudev/eudev.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="enhanced userland device daemon"
 PKGDOWNLOAD="https://github.com/gentoo/eudev/archive/v$PKGVERSION.tar.gz"
-PKGDEPENDS="core/util-linux"
+PKGDEPENDS="util-linux"
 PKGPROTECT="/etc/udev/udev.conf"
 
 : ${CHOST:=$(uname -m)-linux-musl}
--- a/core/file/file.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/file/file.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="file identification"
 PKGDOWNLOAD="ftp://ftp.astron.com/pub/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="compression/zlib"
+PKGDEPENDS="zlib"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/core/findutils/findutils.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/findutils/findutils.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/gawk/gawk.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/gawk/gawk.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -31,7 +31,7 @@
 : ${LIBS:=}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/grep/grep.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/grep/grep.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3+"
 PKGSUMMARY="GNU utility to search strings"
 PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/pcre core/texinfo:build"
+PKGDEPENDS="pcre texinfo:build"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/grub/grub.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/grub/grub.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3+"
 PKGSUMMARY="GNU boot loader"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="core/lvm2 dev/binutils:build dev/bison dev/flex lib/linux-headers"
+PKGDEPENDS="lvm2 binutils:build bison flex linux-headers"
 PKGOPTIONS="LZMA NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -37,14 +37,14 @@
 : ${NLS:=yes}
 
 if [ "$LZMA" = "yes" ]; then
-	PKGDEPENDS="compression/xz $PKGDEPENDS"
+	PKGDEPENDS="xz $PKGDEPENDS"
 	with_lzma="--enable-liblzma"
 else
 	with_lzma="--disable-liblzma"
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/kbd/kbd.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/kbd/kbd.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="console configuration tools"
 PKGDOWNLOAD="https://www.kernel.org/pub/linux/utils/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/linux-headers"
+PKGDEPENDS="linux-headers"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${NLS:=}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/kmod/kmod.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/kmod/kmod.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Linux kernel module utilities"
 PKGDOWNLOAD="https://www.kernel.org/pub/linux/utils/kernel/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="compression/zlib"
+PKGDEPENDS="zlib"
 PKGOPTIONS="XZ ZLIB"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -34,14 +34,14 @@
 : ${ZLIB:=yes}
 
 if [ "$XZ" = "yes" ]; then
-	PKGDEPENDS="compression/xz $PKGDEPENDS"
+	PKGDEPENDS="xz $PKGDEPENDS"
 	with_xz="--with-xz"
 else
 	with_xz="--without-xz"
 fi
 
 if [ "$ZLIB" = "yes" ]; then
-	PKGDEPENDS="compression/zlib $PKGDEPENDS"
+	PKGDEPENDS="zlib $PKGDEPENDS"
 	with_zlib="--with-zlib"
 else
 	with_zlib="--without-zlib"
--- a/core/less/less.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/less/less.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3+ CUSTOM"
 PKGSUMMARY="program for viewing text files"
 PKGDOWNLOAD="http://www.greenwoodsoftware.com/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/pcre"
+PKGDEPENDS="pcre"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/core/libcap/libcap.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/libcap/libcap.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="POSIX 1003.1e capabilities"
 PKGDOWNLOAD="https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="core/attr lib/linux-headers perl/perl"
+PKGDEPENDS="attr linux-headers perl"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/core/lvm2/lvm2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/lvm2/lvm2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2 LGPLv21"
 PKGSUMMARY="LVM utilities"
 PKGDOWNLOAD="https://mirrors.kernel.org/sourceware/$PKGNAME/LVM2.$PKGVERSION.tgz"
-PKGDEPENDS="lib/libaio"
+PKGDEPENDS="libaio"
 PKGOPTIONS="READLINE"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${READLINE:=yes}
 
 if [ "$READLINE" = "yes" ]; then
-	PKGDEPENDS="lib/readline $PKGDEPENDS"
+	PKGDEPENDS="readline $PKGDEPENDS"
 	with_readline="--enable-readline"
 else
 	with_readline="--disable-readline"
--- a/core/mandoc/mandoc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/mandoc/mandoc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="ISC BSD2CLAUSE BSD3CLAUSE"
 PKGSUMMARY="UNIX manpage compiler"
 PKGDOWNLOAD="http://mandoc.bsd.lv/snapshots/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="compression/zlib"
+PKGDEPENDS="zlib"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/core/procps/procps.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/procps/procps.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2 LGPLv21+"
 PKGSUMMARY="monitoring tools"
 PKGDOWNLOAD="https://gitlab.com/procps-ng/procps/-/archive/v$PKGVERSION/$PKGNAME-v$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/ncurses"
+PKGDEPENDS="ncurses"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/rhash/rhash.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/rhash/rhash.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,14 +32,14 @@
 : ${SSL:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-gettext"
 else
 	with_nls="--disable-gettext"
 fi
 
 if [ "$SSL" = "yes" ]; then
-	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
+	PKGDEPENDS="libressl $PKGDEPENDS"
 	with_ssl="--enable-openssl"
 else
 	with_ssl="--disable-openssl"
--- a/core/sed/sed.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/sed/sed.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -33,13 +33,13 @@
 : ${NLS:=yes}
 
 if [ "$ACL" = "yes" ]; then
-	PKGDEPENDS="core/acl $PKGDEPENDS"
+	PKGDEPENDS="acl $PKGDEPENDS"
 	with_acl="--with-acl"
 else
 	with_acl="--without-acl"
 fi
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/tar/tar.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/tar/tar.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -34,13 +34,13 @@
 : ${NLS:=yes}
 
 if [ "$ACL" = "yes" ]; then
-	PKGDEPENDS="core/acl $PKGDEPENDS"
+	PKGDEPENDS="acl $PKGDEPENDS"
 	with_acl="--with-acl"
 else
 	with_acl="--without-acl"
 fi
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/texinfo/texinfo.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/texinfo/texinfo.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3"
 PKGSUMMARY="GNU documentation format"
 PKGDOWNLOAD="https://ftp.gnu.org/pub/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="perl/perl"
+PKGDEPENDS="perl"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/core/tmux/tmux.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/tmux/tmux.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD ISC"
 PKGSUMMARY="terminal multiplexer"
 PKGDOWNLOAD="https://github.com/tmux/tmux/releases/download/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="core/gettext lib/libevent lib/ncurses"
+PKGDEPENDS="gettext libevent ncurses"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/core/util-linux/util-linux.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/core/util-linux/util-linux.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -58,14 +58,14 @@
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
 fi
 
 if [ "$PYTHON" = "yes" ]; then
-	PKGDEPENDS="python/python $PKGDEPENDS"
+	PKGDEPENDS="python $PKGDEPENDS"
 	with_python="--with-python=3"
 else
 	with_python="--without-python"
--- a/crypto/gcr/gcr.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/crypto/gcr/gcr.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="library for displaying certificates and crypto UI"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib"
+PKGDEPENDS="glib"
 PKGOPTIONS="GTK INTROSPECTION NLS VALA"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -38,28 +38,28 @@
 : ${VALA:=yes}
 
 if [ "$GTK" = "yes" ]; then
-	PKGDEPENDS="graphics/gtk $PKGDEPENDS"
+	PKGDEPENDS="gtk $PKGDEPENDS"
 	with_gtk="--with-gtk"
 else
 	with_gtk="--without-gtk"
 fi
 
 if [ "$INTROSPECTION" = "yes" ]; then
-	PKGDEPENDS="dev/gobject-introspection:build text/libxslt $PKGDEPENDS"
+	PKGDEPENDS="gobject-introspection:build libxslt $PKGDEPENDS"
 	with_introspection="--enable-introspection"
 else
 	with_introspection="--disable-introspection"
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
 fi
 
 if [ "$VALA" = "yes" ]; then
-	PKGDEPENDS="lang/vala $PKGDEPENDS"
+	PKGDEPENDS="vala $PKGDEPENDS"
 	with_vala="--enable-vala"
 else
 	with_vala="--disable-vala"
--- a/crypto/gnutls/gnutls.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/crypto/gnutls/gnutls.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="SSL/TLS implementation"
 PKGDOWNLOAD="https://www.gnupg.org/ftp/gcrypt/$PKGNAME/v3.6/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="crypto/nettle lib/libtasn1 crypto/p11-kit"
+PKGDEPENDS="nettle libtasn1 p11-kit"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/crypto/libgpg-error/libgpg-error.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/crypto/libgpg-error/libgpg-error.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/crypto/libressl/libressl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/crypto/libressl/libressl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="OpenSSL fork from OpenBSD"
 PKGDOWNLOAD="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.2.tar.gz"
-PKGDEPENDS="dev/cmake:build"
+PKGDEPENDS="cmake:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/crypto/nettle/nettle.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/crypto/nettle/nettle.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv3 GPLv2 GPLv3"
 PKGSUMMARY="GNU crypto library"
 PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/gmp"
+PKGDEPENDS="gmp"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/crypto/p11-kit/p11-kit.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/crypto/p11-kit/p11-kit.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="PKCS#11 library"
 PKGDOWNLOAD="https://github.com/p11-glue/p11-kit/releases/download/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/libtasn1 lib/libffi"
+PKGDEPENDS="libtasn1 libffi"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/databases/sqlite/sqlite.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/databases/sqlite/sqlite.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="PUBLICDOMAIN"
 PKGSUMMARY="SQL database engine"
 PKGDOWNLOAD="https://sqlite.org/2019/sqlite-src-$PKGVERSION.zip"
-PKGDEPENDS="compression/zlib"
+PKGDEPENDS="zlib"
 PKGOPTIONS="READLINE TCL"
 
 : ${CC:=clang}
@@ -32,17 +32,17 @@
 : ${TCL:=yes}
 
 if [ "$READLINE" = "yes" ]; then
-	PKGDEPENDS="lib/readline $PKGDEPENDS"
+	PKGDEPENDS="readline $PKGDEPENDS"
 	with_readline="--enable-readline"
 else
 	with_readline="--disable-readline"
 fi
 
 if [ "$TCL" = "yes" ]; then
-	PKGDEPENDS="lang/tcl $PKGDEPENDS"
+	PKGDEPENDS="tcl $PKGDEPENDS"
 	with_tcl="--enable-tcl"
 else
-	PKGDEPENDS="lang/tcl:build $PKGDEPENDS"
+	PKGDEPENDS="tcl:build $PKGDEPENDS"
 	with_tcl="--disable-tcl"
 fi
 
--- a/desktop/dconf/dconf.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/desktop/dconf/dconf.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="configuration database system"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/0.32/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="core/bash-completion:build dev/meson:build lib/glib"
+PKGDEPENDS="bash-completion:build meson:build glib"
 PKGOPTIONS="VALA"
 
 : ${CC:=clang}
@@ -30,7 +30,7 @@
 : ${VALA:=yes}
 
 if [ "$VALA" = "yes" ]; then
-	PKGDEPENDS="lang/vala $PKGDEPENDS"
+	PKGDEPENDS="vala $PKGDEPENDS"
 	with_vala="-D vapi=true"
 else
 	with_vala="-D vapi=false"
--- a/desktop/desktop-file-utils/desktop-file-utils.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/desktop/desktop-file-utils/desktop-file-utils.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="command line utilities for working with desktop entries"
 PKGDOWNLOAD="https://www.freedesktop.org/software/$PKGNAME/releases/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib"
+PKGDEPENDS="glib"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/desktop/icon-naming-utils/icon-naming-utils.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/desktop/icon-naming-utils/icon-naming-utils.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="script for maintaining backward compatibility with icon themes"
 PKGDOWNLOAD="http://tango.freedesktop.org/releases/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="perl/perl perl/p5-xml-simple"
+PKGDEPENDS="perl p5-xml-simple"
 
 build()
 {
--- a/desktop/libnotify/libnotify.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/desktop/libnotify/libnotify.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,11 +21,11 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="library for sending desktop notifications"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/0.7/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/gobject-introspection
-            dev/meson:build
-            graphics/gdk-pixbuf
-            graphics/gtk
-            lib/glib"
+PKGDEPENDS="gobject-introspection
+            meson:build
+            gdk-pixbuf
+            gtk
+            glib"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/desktop/libwnck/libwnck.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/desktop/libwnck/libwnck.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="window navigator construction kit"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/3.31/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="desktop/startup-notification dev/gobject-introspection"
+PKGDEPENDS="startup-notification gobject-introspection"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/desktop/libwnck2/libwnck2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/desktop/libwnck2/libwnck2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,12 +21,12 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="window navigator construction kit"
 PKGDOWNLOAD="https://download.gnome.org/sources/libwnck/2.31/libwnck-$PKGVERSION.tar.xz"
-PKGDEPENDS="desktop/startup-notification
-            dev/gobject-introspection
-            graphics/gdk-pixbuf:build
-            graphics/gtk2
-            x11/libx11
-            x11/libxres"
+PKGDEPENDS="startup-notification
+            gobject-introspection
+            gdk-pixbuf:build
+            gtk2
+            libx11
+            libxres"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/desktop/startup-notification/startup-notification.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/desktop/startup-notification/startup-notification.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20 CUSTOM"
 PKGSUMMARY="startup notification protocol"
 PKGDOWNLOAD="http://www.freedesktop.org/software/$PKGNAME/releases/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/libx11 x11/libxcb x11/xcb-util"
+PKGDEPENDS="libx11 libxcb xcb-util"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/desktop/zenity/zenity.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/desktop/zenity/zenity.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="dialog boxes utility from shell scripts"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/3.32/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="desktop/libnotify"
+PKGDEPENDS="libnotify"
 PKGOPTIONS="WEBKIT"
 
 : ${CHOST:=$(uname -m)-linux-musl}
--- a/dev/autoconf/autoconf.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/autoconf/autoconf.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+ GPLv3+"
 PKGSUMMARY="GNU tool for configuring source code"
 PKGDOWNLOAD="ftp://ftp.gnu.org/pub/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/m4 dev/make:build perl/perl"
+PKGDEPENDS="m4 make:build perl"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/dev/autoconf213/autoconf213.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/autoconf213/autoconf213.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+ GPLv3+"
 PKGSUMMARY="GNU tool for configuring source code (legacy)"
 PKGDOWNLOAD="ftp://ftp.gnu.org/pub/gnu/autoconf/autoconf-$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/m4 dev/make:build perl/perl"
+PKGDEPENDS="m4 make:build perl"
 
 build()
 {
--- a/dev/binutils/binutils.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/binutils/binutils.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3"
 PKGSUMMARY="programs to manipulate binary and object files"
 PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="compression/zlib"
+PKGDEPENDS="zlib"
 PKGOPTIONS="GDB NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -42,7 +42,7 @@
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/dev/bison/bison.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/bison/bison.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -35,7 +35,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/dev/clang/clang.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/clang/clang.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -22,7 +22,7 @@
 PKGSUMMARY="C language family frontend for LLVM"
 PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/cfe-$PKGVERSION.src.tar.xz
              https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/clang-tools-extra-$PKGVERSION.src.tar.xz"
-PKGDEPENDS="dev/cmake:build"
+PKGDEPENDS="cmake:build"
 PKGOPTIONS="COMPILER_RT LIBCXX LLD TOOLS"
 
 : ${CC:=clang}
--- a/dev/cmake/cmake.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/cmake/cmake.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,14 +21,14 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="cross platform make"
 PKGDOWNLOAD="https://github.com/Kitware/CMake/releases/download/v$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="network/curl
-            lib/expat
-            lib/jsoncpp
-            lib/libuv
-            core/rhash
-            compression/bzip2
-            compression/xz
-            compression/libarchive"
+PKGDEPENDS="curl
+            expat
+            jsoncpp
+            libuv
+            rhash
+            bzip2
+            xz
+            libarchive"
 PKGOPTIONS="QT5"
 
 : ${CC:=clang}
--- a/dev/doxygen/doxygen.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/doxygen/doxygen.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -23,7 +23,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="tool to generate documentation from source code"
 PKGDOWNLOAD="http://doxygen.nl/files/$PKGNAME-$PKGVERSION.src.tar.gz"
-PKGDEPENDS="dev/cmake:build"
+PKGDEPENDS="cmake:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/dev/gcc/gcc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/gcc/gcc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3+"
 PKGSUMMARY="GNU compiler collections"
 PKGDOWNLOAD="ftp://gcc.gnu.org/pub/gcc/releases/$PKGNAME-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="compression/zlib lib/gmp lib/mpfr lib/mpc"
+PKGDEPENDS="zlib gmp mpfr mpc"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -36,7 +36,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/dev/gobject-introspection/gobject-introspection.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/gobject-introspection/gobject-introspection.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPL"
 PKGSUMMARY="introspection system for GObject-based libraries"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/1.60/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build"
+PKGDEPENDS="meson:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/dev/gtk-doc/gtk-doc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/gtk-doc/gtk-doc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2 GFDLv11"
 PKGSUMMARY="GTK documentation tool"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/1.29/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="text/docbook-xml text/docbook-xsl"
+PKGDEPENDS="docbook-xml docbook-xsl"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/dev/help2man/help2man.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/help2man/help2man.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3"
 PKGSUMMARY="GNU tool to create man files"
 PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="perl/perl"
+PKGDEPENDS="perl"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,8 +33,8 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
-	PKGDEPENDS="perl/p5-locale-gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
+	PKGDEPENDS="p5-locale-gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/dev/intltool/intltool.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/intltool/intltool.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="utility scripts for internationalizing XML"
 PKGDOWNLOAD="https://launchpad.net/$PKGNAME/trunk/$PKGVERSION/+download/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="perl/p5-xml-parser"
+PKGDEPENDS="p5-xml-parser"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/dev/lld/lld.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/lld/lld.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT CUSTOM"
 PKGSUMMARY="LLVM's linker"
 PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz"
-PKGDEPENDS="dev/cmake:build"
+PKGDEPENDS="cmake:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/dev/lldb/lldb.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/lldb/lldb.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT CUSTOM"
 PKGSUMMARY="LLVM debugger"
 PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz"
-PKGDEPENDS="dev/cmake:build dev/swig:build lib/libffi"
+PKGDEPENDS="cmake:build swig:build libffi"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/dev/llvm/llvm.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/llvm/llvm.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT CUSTOM"
 PKGSUMMARY="low level virtual machine compiler infrastructure"
 PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz"
-PKGDEPENDS="lib/ncurses python/python compression/zlib dev/cmake:build"
+PKGDEPENDS="ncurses python zlib cmake:build"
 PKGOPTIONS="DOXYGEN FFI LIBCXX LIBEDIT XML LLD NCURSES SPHINX TARGETS ZLIB"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -41,35 +41,35 @@
 : ${ZLIB:=yes}
 
 if [ "$DOXYGEN" = "yes" ]; then
-	PKGDEPENDS="dev/doxygen:build $PKGDEPENDS"
+	PKGDEPENDS="doxygen:build $PKGDEPENDS"
 	with_doxygen="-DLLVM_ENABLE_DOXYGEN=On"
 else
 	with_doxygen="-DLLVM_ENABLE_DOXYGEN=Off"
 fi
 
 if [ "$FFI" = "yes" ]; then
-	PKGDEPENDS="lib/libffi $PKGDEPENDS"
+	PKGDEPENDS="libffi $PKGDEPENDS"
 	with_ffi="-DLLVM_ENABLE_FFI=On"
 else
 	with_ffi="-DLLVM_ENABLE_FFI=Off"
 fi
 
 if [ "$LIBCXX" = "yes" ]; then
-	PKGDEPENDS="lib/libc++ $PKGDEPENDS"
+	PKGDEPENDS="libc++ $PKGDEPENDS"
 	with_libcxx="-DLLVM_ENABLE_LIBCXX=On"
 else
 	with_libcxx="-DLLVM_ENABLE_LIBCXX=Off"
 fi
 
 if [ "$LIBEDIT" = "yes" ]; then
-	PKGDEPENDS="lib/libedit $PKGDEPENDS"
+	PKGDEPENDS="libedit $PKGDEPENDS"
 	with_libedit="-DLLVM_ENABLE_LIBEDIT=On"
 else
 	with_libedit="-DLLVM_ENABLE_LIBEDIT=Off"
 fi
 
 if [ "$XML" = "yes" ]; then
-	PKGDEPENDS="text/libxml2 $PKGDEPENDS"
+	PKGDEPENDS="libxml2 $PKGDEPENDS"
 	with_xml="-DLLVM_ENABLE_LIBXML2=On"
 else
 	with_xml="-DLLVM_ENABLE_LIBXML2=Off"
@@ -82,7 +82,7 @@
 fi
 
 if [ "$NCURSES" = "yes" ]; then
-	PKGDEPENDS="lib/ncurses $PKGDEPENDS"
+	PKGDEPENDS="ncurses $PKGDEPENDS"
 	with_ncurses="-DLLVM_ENABLE_TERMINFO=On"
 else
 	with_ncurses="-DLLVM_ENABLE_TERMINFO=Off"
@@ -96,7 +96,7 @@
 fi
 
 if [ "$ZLIB" = "yes" ]; then
-	PKGDEPENDS="compression/zlib $PKGDEPENDS"
+	PKGDEPENDS="zlib $PKGDEPENDS"
 	with_zlib="-DLLVM_ENABLE_ZLIB=On"
 else
 	with_zlib="-DLLVM_ENABLE_ZLIB=Off"
--- a/dev/make/make.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/make/make.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -42,7 +42,7 @@
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/dev/mercurial/mercurial.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/mercurial/mercurial.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="scalable distributed SCM tool"
 PKGDOWNLOAD="https://www.mercurial-scm.org/release/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python2 python/py-setuptools python/py-docutils"
+PKGDEPENDS="python2 py-setuptools py-docutils"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/dev/meson/meson.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/meson/meson.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="APACHE20"
 PKGSUMMARY="the meson build system"
 PKGDOWNLOAD="https://github.com/mesonbuild/meson/releases/download/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/ninja python/python python/py-setuptools:build"
+PKGDEPENDS="ninja python py-setuptools:build"
 
 build()
 {
--- a/dev/swig/swig.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dev/swig/swig.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -34,7 +34,7 @@
 : ${PCRE:=yes}
 
 if [ "$PCRE" = "yes" ]; then
-	PKGDEPENDS="lib/pcre $PKGDEPENDS"
+	PKGDEPENDS="pcre $PKGDEPENDS"
 	with_pcre="--with-pcre"
 else
 	with_pcre="--without-pcre"
--- a/dns/libidn/libidn.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dns/libidn/libidn.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/dns/libidn2/libidn2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/dns/libidn2/libidn2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv3+ GPLv2+ GPLv3+"
 PKGSUMMARY="implementation of the Stringprep, Punycode and IDNA specifications"
 PKGDOWNLOAD="https://ftp.gnu.org/gnu/libidn/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/libunistring"
+PKGDEPENDS="libunistring"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/editors/nano/nano.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/editors/nano/nano.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3"
 PKGSUMMARY="GNU nano editor"
 PKGDOWNLOAD="https://www.nano-editor.org/dist/v4/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/ncurses"
+PKGDEPENDS="ncurses"
 PKGOPTIONS="BROWSER
             COLOR
             COMMENT
@@ -109,7 +109,7 @@
 fi
 
 if [ "$LIBMAGIC" = "yes" ]; then
-	PKGDEPENDS="compression/zlib core/file $PKGDEPENDS"
+	PKGDEPENDS="zlib file $PKGDEPENDS"
 	with_libmagic="--enable-libmagic"
 else
 	with_libmagic="--disable-libmagic"
@@ -140,7 +140,7 @@
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/editors/vim/vim.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/editors/vim/vim.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -43,7 +43,7 @@
 : ${TERMINAL:=yes}
 
 if [ "$ACL" = "yes" ]; then
-	PKGDEPENDS="core/acl $PKGDEPENDS"
+	PKGDEPENDS="acl $PKGDEPENDS"
 	with_acl="--enable-acl"
 else
 	with_acl="--disable-acl"
@@ -57,14 +57,14 @@
 fi
 
 if [ "$GTK" = "yes" ]; then
-	PKGDEPENDS="graphics/gtk $PKGDEPENDS"
+	PKGDEPENDS="gtk $PKGDEPENDS"
 	with_gui="--enable-gui=gtk3"
 else
 	with_gui="--enable-gui=no"
 fi
 
 if [ "$LIBCANBERRA" = "yes" ]; then
-	PKGDEPENDS="audio/libcanberra $PKGDEPENDS"
+	PKGDEPENDS="libcanberra $PKGDEPENDS"
 	with_libcanberra="--enable-canberra"
 else
 	with_libcanberra="--disable-canberra"
@@ -77,35 +77,35 @@
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
 fi
 
 if [ "$PERL" = "yes" ]; then
-	PKGDEPENDS="perl/perl $PKGDEPENDS"
+	PKGDEPENDS="perl $PKGDEPENDS"
 	with_perl="--enable-perlinterp=dynamic"
 else
 	with_perl="--disable-perlinterp"
 fi
 
 if [ "$PYTHON" = "yes" ]; then
-	PKGDEPENDS="python/python $PKGDEPENDS"
+	PKGDEPENDS="python $PKGDEPENDS"
 	with_python="--enable-python3interp=dynamic"
 else
 	with_python="--disable-python3interp"
 fi
 
 if [ "$RUBY" = "yes" ]; then
-	PKGDEPENDS="ruby/ruby $PKGDEPENDS"
+	PKGDEPENDS="ruby $PKGDEPENDS"
 	with_ruby="--enable-rubyinterp=dynamic"
 else
 	with_ruby="--disable-rubyinterp"
 fi
 
 if [ "$TCL" = "yes" ]; then
-	PKGDEPENDS="lang/tcl $PKGDEPENDS"
+	PKGDEPENDS="tcl $PKGDEPENDS"
 	with_tcl="--enable-tclinterp=dynamic"
 else
 	with_tcl="--disable-tclinterp"
--- a/emulation/libretro-craft/libretro-craft.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/emulation/libretro-craft/libretro-craft.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -25,7 +25,7 @@
 PKGSUMMARY="libretro implementation for craft (Minecraft clone)"
 PKGDOWNLOAD="https://github.com/libretro/Craft/archive/$_COMMIT.tar.gz
              https://raw.github.com/libretro/libretro-super/master/dist/info/craft_libretro.info"
-PKGDEPENDS="graphics/mesa"
+PKGDEPENDS="mesa"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/emulation/libretro-dolphin/libretro-dolphin.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/emulation/libretro-dolphin/libretro-dolphin.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -25,7 +25,7 @@
 PKGSUMMARY="libretro implementation for dolphin (Nintendo Gamecube/WII)"
 PKGDOWNLOAD="https://github.com/libretro/dolphin/archive/$_COMMIT.tar.gz
              https://raw.github.com/libretro/libretro-super/master/dist/info/dolphin_libretro.info"
-PKGDEPENDS="dev/cmake:build"
+PKGDEPENDS="cmake:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/emulation/libretro-openlara/libretro-openlara.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/emulation/libretro-openlara/libretro-openlara.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -25,7 +25,7 @@
 PKGSUMMARY="libretro implementation for openlara (Tomb Raider clone)"
 PKGDOWNLOAD="https://github.com/libretro/openlara/archive/$_COMMIT.tar.gz
              https://raw.github.com/libretro/libretro-super/master/dist/info/openlara_libretro.info"
-PKGDEPENDS="graphics/mesa"
+PKGDEPENDS="mesa"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/emulation/retroarch/retroarch.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/emulation/retroarch/retroarch.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -69,35 +69,35 @@
 : ${ZLIB:=yes}
 
 if [ "$ALSA" = "yes" ]; then
-	PKGDEPENDS="audio/alsa-lib"
+	PKGDEPENDS="alsa-lib"
 	with_alsa="--enable-alsa"
 else
 	with_alsa="--disable-alsa"
 fi
 
 if [ "$DBUS" = "yes" ]; then
-	PKGDEPENDS="network/dbus $PKGDEPENDS"
+	PKGDEPENDS="dbus $PKGDEPENDS"
 	with_dbus="--enable-dbus"
 else
 	with_dbus="--disable-dbus"
 fi
 
 if [ "$FFMPEG" = "yes" ]; then
-	PKGDEPENDS="multimedia/ffmpeg $PKGDEPENDS"
+	PKGDEPENDS="ffmpeg $PKGDEPENDS"
 	with_ffmpeg="--enable-ffmpeg"
 else
 	with_ffmpeg="--disable-ffmpeg"
 fi
 
 if [ "$FLAC" = "yes" ]; then
-	PKGDEPENDS="audio/flac $PKGDEPENDS"
+	PKGDEPENDS="flac $PKGDEPENDS"
 	with_flac="--enable-flac"
 else
 	with_flac="--disable-flac"
 fi
 
 if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="fonts/freetype $PKGDEPENDS"
+	PKGDEPENDS="freetype $PKGDEPENDS"
 	with_freetype="--enable-freetype"
 else
 	with_freetype="--disable-freetype"
@@ -111,14 +111,14 @@
 fi
 
 if [ "$KMS" = "yes" ]; then
-	PKGDEPENDS="graphics/mesa graphics/libdrm $PKGDEPENDS"
+	PKGDEPENDS="mesa libdrm $PKGDEPENDS"
 	with_kms="--enable-kms"
 else
 	with_kms="--disable-kms"
 fi
 
 if [ "$OPENAL" = "yes" ]; then
-	PKGDEPENDS="audio/openal-soft $PKGDEPENDS"
+	PKGDEPENDS="openal-soft $PKGDEPENDS"
 	with_openal="--enable-al"
 else
 	with_openal="--disable-al"
@@ -126,7 +126,7 @@
 
 if [ "$OPENGL" = "yes" ]; then
 	if [ "$KMS" != "yes" ]; then
-		PKGDEPENDS="graphics/mesa $PKGDEPENDS"
+		PKGDEPENDS="mesa $PKGDEPENDS"
 	fi
 
 	with_opengl="--enable-opengl"
@@ -135,14 +135,14 @@
 fi
 
 if [ "$PULSEAUDIO" = "yes" ]; then
-	PKGDEPENDS="audio/pulseaudio $PKGDEPENDS"
+	PKGDEPENDS="pulseaudio $PKGDEPENDS"
 	with_pulseaudio="--enable-pulse"
 else
 	with_pulseaudio="--disable-pulse"
 fi
 
 if [ "$QT" = "yes" ];then
-	PKGDEPENDS="qt/qtbase $PKGDEPENDS"
+	PKGDEPENDS="qtbase $PKGDEPENDS"
 	with_qt="--enable-qt"
 else
 	with_qt="--disable-qt"
@@ -156,40 +156,40 @@
 fi
 
 if [ "$UDEV" = "yes" ]; then
-	PKGDEPENDS="core/eudev $PKGDEPENDS"
+	PKGDEPENDS="eudev $PKGDEPENDS"
 	with_udev="--enable-udev"
 else
 	with_udev="--disable-udev"
 fi
 
 if [ "$USB" = "yes" ]; then
-	PKGDEPENDS="lib/libusb $PKGDEPENDS"
+	PKGDEPENDS="libusb $PKGDEPENDS"
 	with_usb="--enable-libusb"
 else
 	with_usb="--disable-libusb"
 fi
 
 if [ "$WAYLAND" = "yes" ]; then
-	PKGDEPENDS="graphics/wayland graphics/wayland-protocols $PKGDEPENDS"
+	PKGDEPENDS="wayland wayland-protocols $PKGDEPENDS"
 	with_wayland="--enable-wayland"
 else
 	with_wayland="--disable-wayland"
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libxcb
-	            x11/libxext
-	            x11/libxinerama
-	            x11/libxrandr
+	PKGDEPENDS="libxcb
+	            libxext
+	            libxinerama
+	            libxrandr
 	            x11/libxshm
-	            x11/libxxf86vm $PKGDEPENDS"
+	            libxxf86vm $PKGDEPENDS"
 	with_x="--enable-x11 --enable-xinerama --enable-xrandr"
 else
 	with_x="--disable-x11 --disable-xinerama --disable-xrandr"
 fi
 
 if [ "$ZLIB" = "yes" ]; then
-	PKGDEPENDS="compression/zlib $PKGDEPENDS"
+	PKGDEPENDS="zlib $PKGDEPENDS"
 	with_zlib="--enable-zlib"
 else
 	with_zlib="--disable-zlib"
--- a/fonts/font-adobe-100dpi/font-adobe-100dpi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-adobe-100dpi/font-adobe-100dpi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org adobe 100dpi fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-adobe-75dpi/font-adobe-75dpi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-adobe-75dpi/font-adobe-75dpi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org adobe 75dpi fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org adobe utopia 100dpi fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org adobe utopia 75dpi fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-adobe-utopia-type1/font-adobe-utopia-type1.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-adobe-utopia-type1/font-adobe-utopia-type1.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org adobe utopia type1 fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-arabic-misc/font-arabic-misc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-arabic-misc/font-arabic-misc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org arabic misc fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-bh-100dpi/font-bh-100dpi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-bh-100dpi/font-bh-100dpi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org bh 100dpi fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-bh-75dpi/font-bh-75dpi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-bh-75dpi/font-bh-75dpi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org bh 75dpi fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org bh lucidatypewriter 100dpi fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org bh lucidatypewriter 75dpi fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-bh-ttf/font-bh-ttf.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-bh-ttf/font-bh-ttf.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org bh ttf fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-bh-type1/font-bh-type1.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-bh-type1/font-bh-type1.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org bh type1 fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-bitstream-100dpi/font-bitstream-100dpi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-bitstream-100dpi/font-bitstream-100dpi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org bitstream 100dpi fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-bitstream-75dpi/font-bitstream-75dpi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-bitstream-75dpi/font-bitstream-75dpi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org bitstream 75dpi fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-bitstream-speedo/font-bitstream-speedo.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-bitstream-speedo/font-bitstream-speedo.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org bitstream speedo fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-bitstream-type1/font-bitstream-type1.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-bitstream-type1/font-bitstream-type1.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org bitstream type1 fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-cronyx-cyrillic/font-cronyx-cyrillic.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-cronyx-cyrillic/font-cronyx-cyrillic.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org cronyx cyrillic fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-cursor-misc/font-cursor-misc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-cursor-misc/font-cursor-misc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org cursor misc fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-daewoo-misc/font-daewoo-misc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-daewoo-misc/font-daewoo-misc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org daewoo misc fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-dec-misc/font-dec-misc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-dec-misc/font-dec-misc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org dec misc fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-ibm-type1/font-ibm-type1.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-ibm-type1/font-ibm-type1.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org ibm type1 fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-isas-misc/font-isas-misc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-isas-misc/font-isas-misc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org isas misc fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-jis-misc/font-jis-misc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-jis-misc/font-jis-misc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org jis misc fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-micro-misc/font-micro-misc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-micro-misc/font-micro-misc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org micro misc fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-misc-cyrillic/font-misc-cyrillic.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-misc-cyrillic/font-misc-cyrillic.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org misc cyrillic fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-misc-ethiopic/font-misc-ethiopic.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-misc-ethiopic/font-misc-ethiopic.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org misc ethiopic fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-misc-meltho/font-misc-meltho.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-misc-meltho/font-misc-meltho.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org misc meltho fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-misc-misc/font-misc-misc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-misc-misc/font-misc-misc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org misc misc fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-mutt-misc/font-mutt-misc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-mutt-misc/font-mutt-misc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org mutt misc fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-schumacher-misc/font-schumacher-misc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-schumacher-misc/font-schumacher-misc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org schumacher misc fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-screen-cyrillic/font-screen-cyrillic.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-screen-cyrillic/font-screen-cyrillic.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org screen cyrillic fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-sony-misc/font-sony-misc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-sony-misc/font-sony-misc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org sony misc fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-sun-misc/font-sun-misc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-sun-misc/font-sun-misc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org sun misc fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-winitzki-cyrillic/font-winitzki-cyrillic.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-winitzki-cyrillic/font-winitzki-cyrillic.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org winitzki cyrillic fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/font-xfree86-type1/font-xfree86-type1.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/font-xfree86-type1/font-xfree86-type1.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org XFree86 type1 fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/bdftopcf:build x11/font-util:build x11/util-macros:build"
+PKGDEPENDS="bdftopcf:build font-util:build util-macros:build"
 
 build()
 {
--- a/fonts/fontconfig/fontconfig.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/fontconfig/fontconfig.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT"
 PKGSUMMARY="library for configuring and customizing font access"
 PKGDOWNLOAD="https://www.freedesktop.org/software/$PKGNAME/release/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/expat fonts/freetype core/util-linux"
+PKGDEPENDS="expat freetype util-linux"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
--- a/fonts/freetype/freetype.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/freetype/freetype.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -34,21 +34,21 @@
 : ${ZLIB:=yes}
 
 if [ "$BZIP2" = "yes" ]; then
-	PKGDEPENDS="compression/bzip2 $PKGDEPENDS"
+	PKGDEPENDS="bzip2 $PKGDEPENDS"
 	with_bzip2="--with-bzip2"
 else
 	with_bzip2="--without-bzip2"
 fi
 
 if [ "$PNG" = "yes" ]; then
-	PKGDEPENDS="graphics/libpng $PKGDEPENDS"
+	PKGDEPENDS="libpng $PKGDEPENDS"
 	with_png="--with-png"
 else
 	with_png="--without-png"
 fi
 
 if [ "$ZLIB" = "yes" ]; then
-	PKGDEPENDS="compression/zlib $PKGDEPENDS"
+	PKGDEPENDS="zlib $PKGDEPENDS"
 	with_zlib="--with-zlib"
 else
 	with_zlib="--without-zlib"
--- a/fonts/harfbuzz/harfbuzz.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/harfbuzz/harfbuzz.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -38,35 +38,35 @@
 : ${ICU:=yes}
 
 if [ "$CAIRO" = "yes" ]; then
-	PKGDEPENDS="graphics/cairo $PKGDEPENDS"
+	PKGDEPENDS="cairo $PKGDEPENDS"
 	with_cairo="--with-cairo"
 else
 	with_cairo="--without-cairo"
 fi
 
 if [ "$FONTCONFIG" = "yes" ]; then
-	PKGDEPENDS="fonts/fontconfig $PKGDEPENDS"
+	PKGDEPENDS="fontconfig $PKGDEPENDS"
 	with_fontconfig="--with-fontconfig"
 else
 	with_fontconfig="--without-fontconfig"
 fi
 
 if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="fonts/freetype $PKGDEPENDS"
+	PKGDEPENDS="freetype $PKGDEPENDS"
 	with_freetype="--with-freetype"
 else
 	with_freetype="--without-freetype"
 fi
 
 if [ "$GLIB" = "yes" ]; then
-	PKGDEPENDS="lib/glib $PKGDEPENDS"
+	PKGDEPENDS="glib $PKGDEPENDS"
 	with_glib="--with-glib --with-gobject"
 else
 	with_glib="--without-glib --without-gobject"
 fi
 
 if [ "$ICU" = "yes" ]; then
-	PKGDEPENDS="lib/icu $PKGDEPENDS"
+	PKGDEPENDS="icu $PKGDEPENDS"
 	with_icu="--with-icu"
 else
 	with_icu="--without-icu"
--- a/fonts/pango/pango.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/pango/pango.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,11 +21,11 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="library for rendering text focusing on internationalization"
 PKGDOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/$PKGNAME/1.43/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build
-            fonts/fontconfig
-            fonts/freetype
-            fonts/harfbuzz
-            graphics/cairo"
+PKGDEPENDS="meson:build
+            fontconfig
+            freetype
+            harfbuzz
+            cairo"
 PKGOPTIONS="WAYLAND X"
 
 : ${CC:=clang}
@@ -38,12 +38,12 @@
 
 # build system has no options yet, just bring dependencies for the moment.
 if [ "$WAYLAND" = "yes" ]; then
-	PKGDEPENDS="graphics/wayland $PKGDEPENDS"
+	PKGDEPENDS="wayland $PKGDEPENDS"
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libxft $PKGDEPENDS"
-	PKGDEPENDS="x11/libxrender $PKGDEPENDS"
+	PKGDEPENDS="libxft $PKGDEPENDS"
+	PKGDEPENDS="libxrender $PKGDEPENDS"
 fi
 
 build()
--- a/fonts/sdl2-ttf/sdl2-ttf.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/sdl2-ttf/sdl2-ttf.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="zlib"
 PKGSUMMARY="font addon for SDL2"
 PKGDOWNLOAD="https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$PKGVERSION.tar.gz"
-PKGDEPENDS="fonts/freetype lib/sdl2"
+PKGDEPENDS="freetype sdl2"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/games/supertux/supertux.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/games/supertux/supertux.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -23,18 +23,18 @@
 PKGLICENSE="GPLv3"
 PKGSUMMARY="sidescroller platform game"
 PKGDOWNLOAD="https://github.com/SuperTux/supertux/releases/download/v$PKGVERSION/SuperTux-v$PKGVERSION-Source.tar.gz"
-PKGDEPENDS="audio/libogg
-            audio/libvorbis
-            audio/openal-soft
-            dev/cmake:build
-            graphics/glbinding
-            graphics/glew
-            graphics/libpng
-            graphics/mesa
-            graphics/sdl2-image
-            lib/boost
-            lib/sdl2
-            network/curl"
+PKGDEPENDS="libogg
+            libvorbis
+            openal-soft
+            cmake:build
+            glbinding
+            glew
+            libpng
+            mesa
+            sdl2-image
+            boost
+            sdl2
+            curl"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/games/wesnoth/wesnoth.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/games/wesnoth/wesnoth.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,14 +21,14 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="turn-based strategy game in fantasy world"
 PKGDOWNLOAD="https://sourceforge.net/projects/wesnoth/files/$PKGNAME-${PKGVERSION%.*}/$PKGNAME-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="audio/sdl2-mixer
-            dev/cmake:build
-            fonts/fontconfig
-            fonts/pango
-            fonts/sdl2-ttf
-            graphics/cairo
-            graphics/sdl2-image
-            lib/boost
+PKGDEPENDS="sdl2-mixer
+            cmake:build
+            fontconfig
+            pango
+            sdl2-ttf
+            cairo
+            sdl2-image
+            boost
             multimedia/sdl2"
 PKGOPTIONS="FRIBIDI NLS NOTIFICATIONS"
 
@@ -48,14 +48,14 @@
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="-DENABLE_NLS=On"
 else
 	with_nls="-DENABLE_NLS=Off"
 fi
 
 if [ "$NOTIFICATIONS" = "yes" ]; then
-	PKGDEPENDS="network/dbus $PKGDEPENDS"
+	PKGDEPENDS="dbus $PKGDEPENDS"
 	with_notifications="-DENABLE_NOTIFICATIONS=On"
 else
 	with_notifications="-DENABLE_NOTIFICATIONS=Off"
--- a/graphics/cairo/cairo.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/cairo/cairo.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21 MPLv11"
 PKGSUMMARY="vector graphics library"
 PKGDOWNLOAD="https://cairographics.org/releases/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="graphics/pixman"
+PKGDEPENDS="pixman"
 PKGOPTIONS="DRM EGL FONTCONFIG FREETYPE GALLIUM GLES2 GLES3 GLIB PDF PNG SVG X"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -44,21 +44,21 @@
 : ${X:=yes}
 
 if [ "$DRM" = "yes" ]; then
-	PKGDEPENDS="core/eudev $PKGDEPENDS"
+	PKGDEPENDS="eudev $PKGDEPENDS"
 	with_drm="--enable-drm"
 else
 	with_drm="--disable-drm"
 fi
 
 if [ "$FONTCONFIG" = "yes" ]; then
-	PKGDEPENDS="fonts/fontconfig $PKGDEPENDS"
+	PKGDEPENDS="fontconfig $PKGDEPENDS"
 	with_fontconfig="--enable-fc"
 else
 	with_fontconfig="--disable-fc"
 fi
 
 if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="fonts/freetype $PKGDEPENDS"
+	PKGDEPENDS="freetype $PKGDEPENDS"
 	with_freetype="--enable-ft"
 else
 	with_freetype="--disable-ft"
@@ -66,7 +66,7 @@
 
 # All these options require mesa.
 if [ "$EGL" = "yes" ] || [ "$GALLIUM" = "yes" ] || [ "$GLES2" = "yes" ] || [ "$GLES3" = "yes" ]; then
-	PKGDEPENDS="graphics/mesa $PKGDEPENDS"
+	PKGDEPENDS="mesa $PKGDEPENDS"
 
 	if [ "$EGL" = "yes" ]; then
 		with_egl="--enable-egl"
@@ -88,7 +88,7 @@
 fi
 
 if [ "$GLIB" = "yes" ]; then
-	PKGDEPENDS="lib/glib $PKGDEPENDS"
+	PKGDEPENDS="glib $PKGDEPENDS"
 	with_glib="--enable-gobject"
 else
 	with_glib="--disable-gobject"
@@ -102,21 +102,21 @@
 fi
 
 if [ "$PNG" = "yes" ]; then
-	PKGDEPENDS="graphics/libpng $PKGDEPENDS"
+	PKGDEPENDS="libpng $PKGDEPENDS"
 	with_png="--enable-png"
 else
 	with_png="--disable-png"
 fi
 
 if [ "$SVG" = "yes" ]; then
-	PKGDEPENDS="graphics/librsvg $PKGDEPENDS"
+	PKGDEPENDS="librsvg $PKGDEPENDS"
 	with_svg="--enable-svg"
 else
 	with_svg="--disable-svg"
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libxrender x11/libxext x11/libx11 x11/libxcb"
+	PKGDEPENDS="libxrender libxext libx11 libxcb"
 	with_x="--enable-xlib $with_x"
 	with_x="--enable-xlib-xrender $with_x"
 	with_x="--enable-xcb=yes $with_x"
--- a/graphics/gdk-pixbuf/gdk-pixbuf.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/gdk-pixbuf/gdk-pixbuf.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="image loading library"
 PKGDOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.38/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build"
+PKGDEPENDS="meson:build"
 PKGOPTIONS="JASPER JPEG PNG TIFF X"
 
 : ${CC:=clang}
@@ -43,28 +43,28 @@
 fi
 
 if [ "$JPEG" = "yes" ]; then
-	PKGDEPENDS="graphics/libjpeg-turbo $PKGDEPENDS"
+	PKGDEPENDS="libjpeg-turbo $PKGDEPENDS"
 	with_jpeg="-D jpeg=true"
 else
 	with_jpeg="-D jpeg=false"
 fi
 
 if [ "$PNG" = "yes" ]; then
-	PKGDEPENDS="graphics/libpng $PKGDEPENDS"
+	PKGDEPENDS="libpng $PKGDEPENDS"
 	with_png="-D png=true"
 else
 	with_png="-D png=false"
 fi
 
 if [ "$TIFF" = "yes" ]; then
-	PKGDEPENDS="graphics/libtiff $PKGDEPENDS"
+	PKGDEPENDS="libtiff $PKGDEPENDS"
 	with_tiff="-D tiff=true"
 else
 	with_tiff="-D tiff=false"
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libx11 $PKGDEPENDS"
+	PKGDEPENDS="libx11 $PKGDEPENDS"
 	with_x="-D x11=true"
 else
 	with_x="-D x11=false"
--- a/graphics/glbinding/glbinding.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/glbinding/glbinding.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT"
 PKGSUMMARY="C++ bindings for the OpenGL API"
 PKGDOWNLOAD="https://github.com/cginternals/glbinding/archive/v$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/cmake:build"
+PKGDEPENDS="cmake:build"
 PKGOPTIONS="DOXYGEN EXAMPLES TOOLS"
 
 : ${CC:=clang}
@@ -33,7 +33,7 @@
 : ${TOOLS:=yes}
 
 if [ "$DOXYGEN" = "yes" ]; then
-	PKGDEPENDS="dev/doxygen:build $PKGDEPENDS"
+	PKGDEPENDS="doxygen:build $PKGDEPENDS"
 	with_doxygen="-DOPTION_BUILD_DOCS=On"
 else
 	with_doxygen="-DOPTION_BUILD_DOCS=Off"
--- a/graphics/glew/glew.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/glew/glew.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE MIT CUSTOM"
 PKGSUMMARY="OpenGL extension wrangler library"
 PKGDOWNLOAD="https://sourceforge.net/projects/glew/files/$PKGNAME/$PKGVERSION/$PKGNAME-$PKGVERSION.tgz"
-PKGDEPENDS="graphics/mesa"
+PKGDEPENDS="mesa"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2 -fPIC}
--- a/graphics/graphviz/graphviz.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/graphviz/graphviz.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="graph drawing programs"
 PKGDOWNLOAD="http://files.malikania.fr/distfiles/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/libtool shells/bash:build"
+PKGDEPENDS="libtool bash:build"
 PKGOPTIONS="FONTCONFIG FREETYPE GD GTK PANGO WEBP X XML"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -42,35 +42,35 @@
 : ${XML:=yes}
 
 if [ "$FONTCONFIG" = "yes" ]; then
-	PKGDEPENDS="fonts/fontconfig $PKGDEPENDS"
+	PKGDEPENDS="fontconfig $PKGDEPENDS"
 	with_fontconfig="--with-fontconfig"
 else
 	with_fontconfig="--without-fontconfig"
 fi
 
 if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="fonts/freetype $PKGDEPENDS"
+	PKGDEPENDS="freetype $PKGDEPENDS"
 	with_freetype="--with-freetype2"
 else
 	with_freetype="--without-freetype2"
 fi
 
 if [ "$GD" = "yes" ]; then
-	PKGDEPENDS="graphics/libgd $PKGDEPENDS"
+	PKGDEPENDS="libgd $PKGDEPENDS"
 	with_gd="--with-libgd"
 else
 	with_gd="--without-libgd"
 fi
 
 if [ "$GTK" = "yes" ]; then
-	PKGDEPENDS="graphics/gtk $PKGDEPENDS"
+	PKGDEPENDS="gtk $PKGDEPENDS"
 	with_gtk="--with-gdk --with-gtk --with-gdk-pixbuf"
 else
 	with_gtk="--without-gdk --without-gtk --without-gdk-pixbuf"
 fi
 
 if [ "$PANGO" = "yes" ]; then
-	PKGDEPENDS="fonts/pango $PKGDEPENDS"
+	PKGDEPENDS="pango $PKGDEPENDS"
 	with_pango="--with-pangocairo"
 else
 	with_pango="--without-pangocairo"
@@ -84,18 +84,18 @@
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libx11 $PKGDEPENDS"
-	PKGDEPENDS="x11/libxaw $PKGDEPENDS"
-	PKGDEPENDS="x11/libxmu $PKGDEPENDS"
-	PKGDEPENDS="x11/libxpm $PKGDEPENDS"
-	PKGDEPENDS="x11/libxt $PKGDEPENDS"
+	PKGDEPENDS="libx11 $PKGDEPENDS"
+	PKGDEPENDS="libxaw $PKGDEPENDS"
+	PKGDEPENDS="libxmu $PKGDEPENDS"
+	PKGDEPENDS="libxpm $PKGDEPENDS"
+	PKGDEPENDS="libxt $PKGDEPENDS"
 	with_x="--with-x"
 else
 	with_x="--without-x"
 fi
 
 if [ "$XML" = "yes" ]; then
-	PKGDEPENDS="lib/expat $PKGDEPENDS"
+	PKGDEPENDS="expat $PKGDEPENDS"
 	with_expat="--with-expat"
 else
 	with_expat="--without-expat"
--- a/graphics/gtk/gtk.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/gtk/gtk.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="multiplatform toolki"
 PKGDOWNLOAD="https://download.gnome.org/sources/gtk+/3.24/gtk+-$PKGVERSION.tar.xz"
-PKGDEPENDS="graphics/cairo graphics/libepoxy lib/libxkbcommon"
+PKGDEPENDS="cairo libepoxy libxkbcommon"
 PKGOPTIONS="CUPS NLS WAYLAND X"
 
 : ${CC:=clang}
@@ -35,14 +35,14 @@
 : ${X:=yes}
 
 if [ "$CUPS" = "yes" ]; then
-	PKGDEPENDS="print/cups $PKGDEPENDS"
+	PKGDEPENDS="cups $PKGDEPENDS"
 	with_cups="--enable-cups"
 else
 	with_cups="--disable-cups"
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
@@ -52,23 +52,23 @@
 	PKGDEPENDS="font/pango $PKGDEPENDS"
 
 	if [ "$WAYLAND" = "yes" ]; then
-		PKGDEPENDS="graphics/wayland $PKGDEPENDS"
+		PKGDEPENDS="wayland $PKGDEPENDS"
 		with_wayland="--enable-wayland-backend"
 	else
 		with_wayland="--disable-wayland-backend"
 	fi
 
 	if [ "$X" = "yes" ]; then
-		PKGDEPENDS="fonts/fontconfig $PKGDEPENDS"
-		PKGDEPENDS="x11/libx11 $PKGDEPENDS"
-		PKGDEPENDS="x11/libxcomposite $PKGDEPENDS"
-		PKGDEPENDS="x11/libxcursor $PKGDEPENDS"
-		PKGDEPENDS="x11/libxdamage $PKGDEPENDS"
-		PKGDEPENDS="x11/libxext $PKGDEPENDS"
-		PKGDEPENDS="x11/libxinerama $PKGDEPENDS"
-		PKGDEPENDS="x11/libxfixes $PKGDEPENDS"
-		PKGDEPENDS="x11/libxi $PKGDEPENDS"
-		PKGDEPENDS="x11/libxrandr $PKGDEPENDS"
+		PKGDEPENDS="fontconfig $PKGDEPENDS"
+		PKGDEPENDS="libx11 $PKGDEPENDS"
+		PKGDEPENDS="libxcomposite $PKGDEPENDS"
+		PKGDEPENDS="libxcursor $PKGDEPENDS"
+		PKGDEPENDS="libxdamage $PKGDEPENDS"
+		PKGDEPENDS="libxext $PKGDEPENDS"
+		PKGDEPENDS="libxinerama $PKGDEPENDS"
+		PKGDEPENDS="libxfixes $PKGDEPENDS"
+		PKGDEPENDS="libxi $PKGDEPENDS"
+		PKGDEPENDS="libxrandr $PKGDEPENDS"
 
 		with_x="--enable-x11-backend"
 	else
--- a/graphics/gtk2/gtk2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/gtk2/gtk2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,20 +21,20 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="multiplatform toolkit"
 PKGDOWNLOAD="https://download.gnome.org/sources/gtk+/2.24/gtk+-$PKGVERSION.tar.xz"
-PKGDEPENDS="accessibility/atk
-            fonts/fontconfig
-            graphics/gdk-pixbuf
-            fonts/pango
-            lib/glib
-            x11/libx11
-            x11/libxcomposite
-            x11/libxcursor
-            x11/libxdamage
-            x11/libxext
-            x11/libxfixes
-            x11/libxi
-            x11/libxinerama
-            x11/libxrandr"
+PKGDEPENDS="atk
+            fontconfig
+            gdk-pixbuf
+            pango
+            glib
+            libx11
+            libxcomposite
+            libxcursor
+            libxdamage
+            libxext
+            libxfixes
+            libxi
+            libxinerama
+            libxrandr"
 PKGOPTIONS="CUPS NLS"
 
 : ${CC:=clang}
@@ -46,14 +46,14 @@
 : ${NLS:=yes}
 
 if [ "$CUPS" = "yes" ]; then
-	PKGDEPENDS="print/cups $PKGDEPENDS"
+	PKGDEPENDS="cups $PKGDEPENDS"
 	with_cups="--enable-cups"
 else
 	with_cups="--disable-cups"
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/graphics/gtksourceview/gtksourceview.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/gtksourceview/gtksourceview.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="a text widget with syntax highlighting for Gtk"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="graphics/gtk lib/glib text/libxml2"
+PKGDEPENDS="gtk glib libxml2"
 PKGOPTIONS="NLS VALA"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -36,14 +36,14 @@
 : ${VALA:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
 fi
 
 if [ "$VALA" = "yes" ]; then
-	PKGDEPENDS="lang/vala $PKGDEPENDS"
+	PKGDEPENDS="vala $PKGDEPENDS"
 	with_vala="--enable-vala"
 else
 	with_vala="--disable-vala"
--- a/graphics/libdrm/libdrm.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/libdrm/libdrm.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -33,7 +33,7 @@
 : ${KMS:=yes}
 
 if [ "$UDEV" = "yes" ]; then
-	PKGDEPENDS="core/eudev $PKGDEPENDS"
+	PKGDEPENDS="eudev $PKGDEPENDS"
 	with_udev="--enable-udev"
 else
 	with_udev="--disable-udev"
--- a/graphics/libepoxy/libepoxy.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/libepoxy/libepoxy.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT CUSTOM"
 PKGSUMMARY="library handling OpenGL function pointer management"
 PKGDOWNLOAD="https://github.com/anholt/$PKGNAME/releases/download/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build"
+PKGDEPENDS="meson:build"
 PKGOPTIONS="X"
 
 : ${CHOST:=$(uname -m)-linux-musl}
--- a/graphics/libexif/libexif.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/libexif/libexif.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/graphics/libgd/libgd.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/libgd/libgd.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -40,21 +40,21 @@
 : ${ZLIB:=no}
 
 if [ "$FONTCONFIG" = "yes" ]; then
-	PKGDEPENDS="fonts/fontconfig $PKGDEPENDS"
+	PKGDEPENDS="fontconfig $PKGDEPENDS"
 	with_fontconfig="--with-fontconfig"
 else
 	with_fontconfig="--without-fontconfig"
 fi
 
 if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="fonts/freetype $PKGDEPENDS"
+	PKGDEPENDS="freetype $PKGDEPENDS"
 	with_freetype="--with-freetype"
 else
 	with_freetype="--without-freetype"
 fi
 
 if [ "$JPEG" = "yes" ]; then
-	PKGDEPENDS="graphics/libjpeg-turbo $PKGDEPENDS"
+	PKGDEPENDS="libjpeg-turbo $PKGDEPENDS"
 	with_jpeg="--with-jpeg"
 else
 	with_jpeg="--without-jpeg"
@@ -68,14 +68,14 @@
 fi
 
 if [ "$PNG" = "yes" ]; then
-	PKGDEPENDS="graphics/libpng $PKGDEPENDS"
+	PKGDEPENDS="libpng $PKGDEPENDS"
 	with_png="--with-png"
 else
 	with_png="--without-png"
 fi
 
 if [ "$TIFF" = "yes" ]; then
-	PKGDEPENDS="graphics/libtiff $PKGDEPENDS"
+	PKGDEPENDS="libtiff $PKGDEPENDS"
 	with_tiff="--with-tiff"
 else
 	with_tiff="--without-tiff"
@@ -89,14 +89,14 @@
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libxpm $PKGDEPENDS"
+	PKGDEPENDS="libxpm $PKGDEPENDS"
 	with_x="--with-xpm --with-x"
 else
 	with_x="--without-xpm --without-x"
 fi
 
 if [ "$ZLIB" = "yes" ]; then
-	PKGDEPENDS="compression/zlib $PKGDEPENDS"
+	PKGDEPENDS="zlib $PKGDEPENDS"
 	with_zlib="--with-zlib"
 else
 	with_zlib="--without-zlib"
--- a/graphics/libjpeg-turbo/libjpeg-turbo.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/libjpeg-turbo/libjpeg-turbo.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="ZLIB BSD3CLAUSE CUSTOM"
 PKGSUMMARY="JPEG image codec library"
 PKGDOWNLOAD="https://downloads.sourceforge.net/project/$PKGNAME/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/cmake:build dev/nasm:build"
+PKGDEPENDS="cmake:build nasm:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/graphics/librsvg/librsvg.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/librsvg/librsvg.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,13 +21,13 @@
 PKGLICENSE="LGPLv20 GPLv2"
 PKGSUMMARY="SVG library"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/2.40/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="fonts/pango
-            graphics/cairo
-            graphics/gdk-pixbuf
-            graphics/gtk
-            lib/glib
-            text/libcroco
-            text/libxml2"
+PKGDEPENDS="pango
+            cairo
+            gdk-pixbuf
+            gtk
+            glib
+            libcroco
+            libxml2"
 PKGOPTIONS="VALA"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -39,7 +39,7 @@
 : ${VALA:=no}
 
 if [ "$VALA" = "yes" ]; then
-	PKGDEPENDS="lang/vala $PKGDEPENDS"
+	PKGDEPENDS="vala $PKGDEPENDS"
 	with_vala="--enable-vala"
 else
 	with_vala="--disable-vala"
--- a/graphics/libtiff/libtiff.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/libtiff/libtiff.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -37,28 +37,28 @@
 : ${ZSTD:=yes}
 
 if [ "$JPEG" = "yes" ]; then
-	PKGDEPENDS="graphics/libjpeg-turbo $PKGDEPENDS"
+	PKGDEPENDS="libjpeg-turbo $PKGDEPENDS"
 	with_jpeg="--enable-jpeg"
 else
 	with_jpeg="--disable-jpeg"
 fi
 
 if [ "$LZMA" = "yes" ]; then
-	PKGDEPENDS="compression/xz $PKGDEPENDS"
+	PKGDEPENDS="xz $PKGDEPENDS"
 	with_lzma="--enable-lzma"
 else
 	with_lzma="--disable-lzma"
 fi
 
 if [ "$ZLIB" = "yes" ]; then
-	PKGDEPENDS="compression/zlib $PKGDEPENDS"
+	PKGDEPENDS="zlib $PKGDEPENDS"
 	with_zlib="--enable-zlib"
 else
 	with_zlib="--disable-zlib"
 fi
 
 if [ "$ZSTD" = "yes" ]; then
-	PKGDEPENDS="compression/zstd $PKGDEPENDS"
+	PKGDEPENDS="zstd $PKGDEPENDS"
 	with_zstd="--enable-zstd"
 else
 	with_zstd="--disable-zstd"
--- a/graphics/libwebp/libwebp.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/libwebp/libwebp.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -44,14 +44,14 @@
 fi
 
 if [ "$PNG" = "yes" ]; then
-	PKGDEPENDS="graphics/libpng $PKGDEPENDS"
+	PKGDEPENDS="libpng $PKGDEPENDS"
 	with_png="--enable-png"
 else
 	with_png="--disable-png"
 fi
 
 if [ "$TIFF" = "yes" ]; then
-	PKGDEPENDS="graphics/libtiff $PKGDEPENDS"
+	PKGDEPENDS="libtiff $PKGDEPENDS"
 	with_tiff="--enable-tiff"
 else
 	with_tiff="--disable-tiff"
--- a/graphics/mesa/mesa.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/mesa/mesa.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="opensource OpenGL implementation"
 PKGDOWNLOAD="https://mesa.freedesktop.org/archive/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build"
+PKGDEPENDS="meson:build"
 PKGOPTIONS="DRI DRM EGL GALLIUM GLVND LLVM PLATFORMS SELINUX VULKAN WAYLAND X"
 
 : ${CC:=clang}
@@ -47,7 +47,7 @@
 with_vulkan_drivers=""
 
 if [ "$DRM" = "yes" ]; then
-	PKGDEPENDS="graphics/libdrm $PKGDEPENDS"
+	PKGDEPENDS="libdrm $PKGDEPENDS"
 	with_platforms="drm"
 fi
 
@@ -72,7 +72,7 @@
 fi
 
 if [ "$LLVM" = "yes" ]; then
-	PKGDEPENDS="dev/llvm $PKGDEPENDS"
+	PKGDEPENDS="llvm $PKGDEPENDS"
 	with_llvm="-D llvm=true"
 else
 	with_llvm="-D llvm=false"
@@ -83,17 +83,17 @@
 fi
 
 if [ "$WAYLAND" = "yes" ]; then
-	PKGDEPENDS="graphics/wayland graphics/wayland-protocols $PKGDEPENDS"
+	PKGDEPENDS="wayland wayland-protocols $PKGDEPENDS"
 	with_platforms="wayland,$with_platforms"
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libx11
-	            x11/libxdamage
-	            x11/libxext
-	            x11/libxrandr
-	            x11/libxshmfence
-	            x11/libxxf86vm
+	PKGDEPENDS="libx11
+	            libxdamage
+	            libxext
+	            libxrandr
+	            libxshmfence
+	            libxxf86vm
 	            $PKGDEPENDS"
 	with_platforms="x11,$with_platforms"
 	with_dri="-D dri3=true"
--- a/graphics/openjpeg/openjpeg.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/openjpeg/openjpeg.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD2CLAUSE"
 PKGSUMMARY="opensource JPEG 2000 codec written in C"
 PKGDOWNLOAD="https://github.com/uclouvain/$PKGNAME/archive/v$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/cmake:build"
+PKGDEPENDS="cmake:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/graphics/pixman/pixman.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/pixman/pixman.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -33,14 +33,14 @@
 : ${PNG:=no}
 
 if [ "$OPENMP" = "yes" ]; then
-	PKGDEPENDS="lib/openmp $PKGDEPENDS"
+	PKGDEPENDS="openmp $PKGDEPENDS"
 	with_openmp="--enable-openmp"
 else
 	with_openmp="--disable-openmp"
 fi
 
 if [ "$PNG" = "yes" ]; then
-	PKGDEPENDS="graphics/libpng $PKGDEPENDS"
+	PKGDEPENDS="libpng $PKGDEPENDS"
 	with_png="--enable-libpng"
 else
 	with_png="--disable-libpng"
--- a/graphics/sdl2-image/sdl2-image.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/sdl2-image/sdl2-image.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="zlib"
 PKGSUMMARY="image addon for SDL2"
 PKGDOWNLOAD="https://www.libsdl.org/projects/SDL_image/release/SDL2_image-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/sdl2"
+PKGDEPENDS="sdl2"
 PKGOPTIONS="BMP
             GIF
             JPEG
@@ -71,7 +71,7 @@
 fi
 
 if [ "$JPEG" = "yes" ]; then
-	PKGDEPENDS="graphics/libjpeg-turbo $PKGDEPENDS"
+	PKGDEPENDS="libjpeg-turbo $PKGDEPENDS"
 	with_jpeg="--enable-jpg"
 else
 	with_jpeg="--disable-jpg"
@@ -114,7 +114,7 @@
 fi
 
 if [ "$TIFF" = "yes" ]; then
-	PKGDEPENDS="graphics/libtiff $PKGDEPENDS"
+	PKGDEPENDS="libtiff $PKGDEPENDS"
 	with_tiff="--enable-tif"
 else
 	with_tiff="--disable-tif"
@@ -139,7 +139,7 @@
 fi
 
 if [ "$WEBP" = "yes" ]; then
-	PKGDEPENDS="graphics/libwebp $PKGDEPENDS"
+	PKGDEPENDS="libwebp $PKGDEPENDS"
 	with_webp="--enable-webp"
 else
 	with_webp="--disable-webp"
--- a/graphics/wayland/wayland.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/wayland/wayland.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT"
 PKGSUMMARY="displayer server protocol"
 PKGDOWNLOAD="https://wayland.freedesktop.org/releases/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/expat"
+PKGDEPENDS="expat"
 PKGOPTIONS="DTD DOCS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -34,14 +34,14 @@
 : ${DOCS:=yes}
 
 if [ "$DTD" = "yes" ]; then
-	PKGDEPENDS="text/libxml2 $PKGDEPENDS"
+	PKGDEPENDS="libxml2 $PKGDEPENDS"
 	with_dtd="--enable-dtd-validation"
 else
 	with_dtd="--disable-dtd-validation"
 fi
 
 if [ "$DOCS" = "yes" ]; then
-	PKGDEPENDS="graphics/graphviz:build dev/doxygen:build text/xmlto:build $PKGDEPENDS"
+	PKGDEPENDS="graphviz:build doxygen:build xmlto:build $PKGDEPENDS"
 	with_docs="--enable-documentation"
 else
 	with_docs="--disable-documentation"
--- a/graphics/weston/weston.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/weston/weston.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -48,7 +48,7 @@
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libx11 x11/libxcb x11/libxcursor"
+	PKGDEPENDS="libx11 libxcb libxcursor"
 	with_x="--enable-xwayland --enable-x11-compositor"
 else
 	with_x="--disable-xwayland --disable-x11-compositor"
--- a/irc/irssi/irssi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/irc/irssi/irssi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="command line IRC client"
 PKGDOWNLOAD="https://github.com/irssi/irssi/releases/download/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib"
+PKGDEPENDS="glib"
 PKGOPTIONS="PERL TRUECOLOR"
 PKGPROTECT="etc/irssi.conf"
 
@@ -35,7 +35,7 @@
 : ${TRUECOLOR:=yes}
 
 if [ "$PERL" = "yes" ]; then
-	PKGDEPENDS="perl/perl $PKGDEPENDS"
+	PKGDEPENDS="perl $PKGDEPENDS"
 	with_perl="--with-perl=module --with-perl-lib=vendor"
 else
 	with_perl="--with-perl=no"
--- a/irc/ngircd/ngircd.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/irc/ngircd/ngircd.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -42,24 +42,24 @@
 fi
 
 if [ "$PAM" = "yes" ]; then
-	PKGDEPENDS="security/linux-pam $PKGDEPENDS"
+	PKGDEPENDS="linux-pam $PKGDEPENDS"
 	with_pam="--with-pam"
 else
 	with_pam="--without-pam"
 fi
 
 if [ "$SSL" = "openssl" ]; then
-	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
+	PKGDEPENDS="libressl $PKGDEPENDS"
 	with_ssl="--with-openssl"
 elif [ "$SSL" = "gnutls" ]; then
-	PKGDEPENDS="crypto/gnutls $PKGDEPENDS"
+	PKGDEPENDS="gnutls $PKGDEPENDS"
 	with_ssl="--with-gnutls"
 else
 	with_ssl="--without-openssl --without-gnutls"
 fi
 
 if [ "$ZLIB" = "zlib" ]; then
-	PKGDEPENDS="compression/zlib $PKGDEPENDS"
+	PKGDEPENDS="zlib $PKGDEPENDS"
 	with_zlib="--with-zlib"
 else
 	with_zlib="--without-zlib"
--- a/lang/mozjs52/mozjs52.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lang/mozjs52/mozjs52.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MPLv20"
 PKGSUMMARY="Mozilla Javascript engine also know as SpiderMonkey"
 PKGDOWNLOAD="http://releases.mozilla.org/pub/firefox/releases/${PKGVERSION}esr/source/firefox-${PKGVERSION}esr.source.tar.xz"
-PKGDEPENDS="shells/bash:build python/python2:build lib/libffi lib/icu compression/zlib"
+PKGDEPENDS="bash:build python2:build libffi icu zlib"
 
 : ${CC:=clang}
 : ${CXX:=clang++}
--- a/lang/tcl/tcl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lang/tcl/tcl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="TCL scripting language"
 PKGDOWNLOAD="http://downloads.sourceforge.net/sourceforge/$PKGNAME/${PKGNAME}${PKGVERSION}-src.tar.gz"
-PKGDEPENDS="compression/zlib"
+PKGDEPENDS="zlib"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lang/vala/vala.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lang/vala/vala.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="compiler using the gobject type system"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/0.44/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib"
+PKGDEPENDS="glib"
 PKGOPTIONS="VALADOC"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${VALADOC:=no}        # TODO: set to on once graphviz is fixed
 
 if [ "$VALADOC" = "yes" ]; then
-	PKGDEPENDS="graphics/graphviz $PKGDEPENDS"
+	PKGDEPENDS="graphviz $PKGDEPENDS"
 	with_valadoc="--enable-valadoc"
 else
 	with_valadoc="--disable-valadoc"
--- a/lib/boost/boost.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/boost/boost.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -40,7 +40,7 @@
 fi
 
 if [ "$ICU" = "yes" ]; then
-	PKGDEPENDS="lib/icu $PKGDEPENDS"
+	PKGDEPENDS="icu $PKGDEPENDS"
 	with_bootstrap_icu="--with-icu"
 else
 	with_bootstrap_icu="--without-icu"
@@ -48,7 +48,7 @@
 fi
 
 if [ "$PYTHON" = "yes" ]; then
-	PKGDEPENDS="python/python $PKGDEPENDS"
+	PKGDEPENDS="python $PKGDEPENDS"
 	with_bootstrap_python="--with-python=/bin/python"
 else
 	with_python="--without-python"
--- a/lib/fuse/fuse.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/fuse/fuse.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2 LGPLv21"
 PKGSUMMARY="The reference implementation of the Linux FUSE interface"
 PKGDOWNLOAD="https://github.com/libfuse/libfuse/releases/download/$PKGNAME-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build"
+PKGDEPENDS="meson:build"
 PKGOPTIONS="EXAMPLES UTILS"
 PKGPROTECT="etc/fuse.conf"
 
--- a/lib/glib/glib.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/glib/glib.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="general purpose low level C library"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/2.60/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson lib/pcre compression/zlib"
+PKGDEPENDS="meson pcre zlib"
 PKGOPTIONS="MOUNT NLS SELINUX"
 
 : ${CC:=clang}
@@ -32,7 +32,7 @@
 : ${SELINUX:=no}
 
 if [ "$MOUNT" = "yes" ]; then
-	PKGDEPENDS="core/util-linux $PKGDEPENDS"
+	PKGDEPENDS="util-linux $PKGDEPENDS"
 	with_mount="-D libmount=true"
 else
 	with_mount="-D libmount=false"
--- a/lib/gvfs/gvfs.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/gvfs/gvfs.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -23,7 +23,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="GNOME virtual file system"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build"
+PKGDEPENDS="meson:build"
 PKGOPTIONS="ADMIN
             AFP
             BLURAY
@@ -52,7 +52,7 @@
 : ${UDEV:=yes}
 
 if [ "$ADMIN" = "yes" ]; then
-	PKGDEPENDS="lib/libcap security/polkit $PKGDEPENDS"
+	PKGDEPENDS="lib/libcap polkit $PKGDEPENDS"
 	with_admin="-D admin=true"
 else
 	with_admin="-D admin=false"
@@ -65,56 +65,56 @@
 fi
 
 if [ "$BLURAY" = "yes" ]; then
-	PKGDEPENDS="multimedia/libbluray $PKGDEPENDS"
+	PKGDEPENDS="libbluray $PKGDEPENDS"
 	with_bluray="-D bluray=true"
 else
 	with_bluray="-D bluray=false"
 fi
 
 if [ "$CRYPTO" = "yes" ]; then
-	PKGDEPENDS="crypto/libgcrypt $PKGDEPENDS"
+	PKGDEPENDS="libgcrypt $PKGDEPENDS"
 	with_crypto="-D gcrypt=true"
 else
 	with_crypto="-D gcrypt=false"
 fi
 
 if [ "$FUSE" = "yes" ]; then
-	PKGDEPENDS="lib/fuse $PKGDEPENDS"
+	PKGDEPENDS="fuse $PKGDEPENDS"
 	with_fuse="-D fuse=true"
 else
 	with_fuse="-D fuse=false"
 fi
 
 if [ "$GCR" = "yes" ]; then
-	PKGDEPENDS="crypto/gcr $PKGDEPENDS"
+	PKGDEPENDS="gcr $PKGDEPENDS"
 	with_gcr="-D gcr=true"
 else
 	with_gcr="-D gcr=false"
 fi
 
 if [ "$HTTP" = "yes" ]; then
-	PKGDEPENDS="network/libsoup $PKGDEPENDS"
+	PKGDEPENDS="libsoup $PKGDEPENDS"
 	with_http="-D http=true"
 else
 	with_http="-D http=false"
 fi
 
 if [ "$LIBARCHIVE" = "yes" ]; then
-	PKGDEPENDS="compression/libarchive $PKGDEPENDS"
+	PKGDEPENDS="libarchive $PKGDEPENDS"
 	with_archive="-D archive=true"
 else
 	with_archive="-D archive=false"
 fi
 
 if [ "$SSH" = "yes" ]; then
-	PKGDEPENDS="network/openssh $PKGDEPENDS"
+	PKGDEPENDS="openssh $PKGDEPENDS"
 	with_ssh="-D sftp=true"
 else
 	with_ssh="-D sftp=false"
 fi
 
 if [ "$UDEV" = "yes" ]; then
-	PKGDEPENDS="lib/libgudev $PKGDEPENDS"
+	PKGDEPENDS="libgudev $PKGDEPENDS"
 	with_udev="-D gudev=true"
 else
 	with_udev="-D gudev=false"
--- a/lib/isl/isl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/isl/isl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT"
 PKGSUMMARY="integer set library"
 PKGDOWNLOAD="http://isl.gforge.inria.fr/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/gmp"
+PKGDEPENDS="gmp"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lib/jansson/jansson.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/jansson/jansson.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT"
 PKGSUMMARY="C library for encoding/decoding JSON"
 PKGDOWNLOAD="http://www.digip.org/$PKGNAME/releases/$PKGNAME-2.12.tar.gz"
-PKGDEPENDS="dev/cmake:build"
+PKGDEPENDS="cmake:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/lib/jsoncpp/jsoncpp.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/jsoncpp/jsoncpp.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="PUBLICDOMAIN"
 PKGSUMMARY="JSON library in C++"
 PKGDOWNLOAD="https://github.com/open-source-parsers/$PKGNAME/archive/$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/meson"
+PKGDEPENDS="meson"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/lib/libaio/libaio.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libaio/libaio.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21+"
 PKGSUMMARY="Linux asynchronous I/O library"
 PKGDOWNLOAD="https://pagure.io/$PKGNAME/archive/$PKGNAME-$PKGVERSION/$PKGNAME-$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/linux-headers"
+PKGDEPENDS="linux-headers"
 
 : ${CC:=clang}
 
--- a/lib/libedit/libedit.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libedit/libedit.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="NetBSD port of editline library"
 PKGDOWNLOAD="https://www.thrysoee.dk/editline/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/ncurses"
+PKGDEPENDS="ncurses"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lib/libevent/libevent.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libevent/libevent.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${SSL:=yes}
 
 if [ "$SS" = "yes" ]; then
-	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
+	PKGDEPENDS="libressl $PKGDEPENDS"
 	with_ssl="--enable-openssl"
 else
 	with_ssl="--disable-openssl"
--- a/lib/libgudev/libgudev.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libgudev/libgudev.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="GObject bindings for udev"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="core/eudev lib/glib"
+PKGDEPENDS="eudev glib"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lib/libical/libical.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libical/libical.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MPLv20 LGPLv21"
 PKGSUMMARY="mplementation of the iCalendar protocols and protocol data units"
 PKGDOWNLOAD="https://github.com/libical/libical/releases/download/v$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/cmake:build perl/perl:build"
+PKGDEPENDS="cmake:build perl:build"
 PKGOPTIONS="GLIB VALA"
 
 : ${CC:=clang}
@@ -32,14 +32,14 @@
 : ${VALA:=no}
 
 if [ "$GLIB" = "yes" ]; then
-	PKGDEPENDS="lib/glib text/libxml2 $PKGDEPENDS"
+	PKGDEPENDS="glib libxml2 $PKGDEPENDS"
 	with_glib="-DICAL_GLIB=On"
 else
 	with_glib="-DICAL_GLIB=Off"
 fi
 
 if [ "$VALA" = "yes" ]; then
-	PKGDEPENDS="lang/vala $PKGDEPENDS"
+	PKGDEPENDS="vala $PKGDEPENDS"
 	with_vala="-DICAL_GLIB_VAPI=On"
 else
 	with_vala="-DICAL_GLIB_VAPI=Off"
--- a/lib/libinput/libinput.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libinput/libinput.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT"
 PKGSUMMARY="library to handle input devices in wayland"
 PKGDOWNLOAD="https://www.freedesktop.org/software/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/libevdev lib/mtdev"
+PKGDEPENDS="libevdev mtdev"
 PKGOPTIONS="DOXYGEN WACOM"
 
 : ${CC:=clang}
@@ -32,14 +32,14 @@
 : ${WACOM:=yes}
 
 if [ "$DOXYGEN" = "yes" ]; then
-	PKGDEPENDS="dev/doxygen $PKGDEPENDS"
+	PKGDEPENDS="doxygen $PKGDEPENDS"
 	with_doxygen="-D documentation=true"
 else
 	with_doxygen="-D documentation=false"
 fi
 
 if [ "$WACOM" = "yes" ]; then
-	PKGDEPENDS="lib/libwacom $PKGDEPENDS"
+	PKGDEPENDS="libwacom $PKGDEPENDS"
 	with_wacom="-D libwacom=true"
 else
 	with_wacom="-D libwacom=false"
--- a/lib/libnftnl/libnftnl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libnftnl/libnftnl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="netfilter library"
 PKGDOWNLOAD="https://netfilter.org/projects/$PKGNAME/files/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="lib/libmnl"
+PKGDEPENDS="libmnl"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lib/libnl/libnl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libnl/libnl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="netlink library"
 PKGSUMMARY="LGPLv21"
 PKGDOWNLOAD="https://github.com/thom311/libnl/releases/download/libnl3_4_0/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/bison:build"
+PKGDEPENDS="bison:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lib/libpeas/libpeas.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libpeas/libpeas.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -23,7 +23,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="gobject-based plugins engine"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build"
+PKGDEPENDS="meson:build"
 PKGOPTIONS="GTK INTROSPECTION VALA"
 
 : ${CC:=clang}
@@ -36,21 +36,21 @@
 : ${VALA:=no}
 
 if [ "$GTK" = "yes" ]; then
-	PKGDEPENDS="graphics/gtk $PKGDEPENDS"
+	PKGDEPENDS="gtk $PKGDEPENDS"
 	with_gtk="-D widgetry=true"
 else
 	with_gtk="-D widgetry=false"
 fi
 
 if [ "$INTROSPECTION" = "yes" ]; then
-	PKGDEPENDS="dev/gobject-introspection:build $PKGDEPENDS"
+	PKGDEPENDS="gobject-introspection:build $PKGDEPENDS"
 	with_introspection="-D introspection=true"
 else
 	with_introspection="-D introspection=false"
 fi
 
 if [ "$VALA" = "yes" ]; then
-	PKGDEPENDS="lang/vala $PKGDEPENDS"
+	PKGDEPENDS="vala $PKGDEPENDS"
 	with_vala="-D vapi=true"
 else
 	with_vala="-D vapi=false"
--- a/lib/libusb/libusb.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libusb/libusb.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -35,7 +35,7 @@
 : ${UDEV:=yes}
 
 if [ "$UDEV" = "yes" ]; then
-	PKGDEPENDS="core/eudev $PKGDEPENDS"
+	PKGDEPENDS="eudev $PKGDEPENDS"
 	with_udev="--enable-udev"
 else
 	with_udev="--disable-udev"
--- a/lib/libuv/libuv.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libuv/libuv.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT BSD ISC"
 PKGSUMMARY="multi-platform asynchronous library"
 PKGDOWNLOAD="https://dist.libuv.org/dist/v$PKGVERSION/$PKGNAME-v$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/linux-headers:build"
+PKGDEPENDS="linux-headers:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lib/libwacom/libwacom.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libwacom/libwacom.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT"
 PKGSUMMARY="library for accessing wacom tablets"
 PKGDOWNLOAD="https://github.com/linuxwacom/libwacom/releases/download/$PKGNAME-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="lib/glib lib/libgudev"
+PKGDEPENDS="glib libgudev"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lib/libxkbcommon/libxkbcommon.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libxkbcommon/libxkbcommon.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="keymap handling library"
 PKGDOWNLOAD="http://xkbcommon.org/download/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="x11/util-macros:build"
+PKGDEPENDS="util-macros:build"
 PKGOPTIONS="DOXYGEN WAYLAND X"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -35,21 +35,21 @@
 : ${WAYLAND:=yes}
 
 if [ "$DOXYGEN" = "yes" ]; then
-	PKGDEPENDS="dev/doxygen:build $PKGDEPENDS"
+	PKGDEPENDS="doxygen:build $PKGDEPENDS"
 	with_doxygen="--with-doxygen"
 else
 	with_doxygen="--without-doxygen"
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libxcb $PKGDEPENDS"
+	PKGDEPENDS="libxcb $PKGDEPENDS"
 	with_x="--enable-x11"
 else
 	with_x="--disable-x11"
 fi
 
 if [ "$WAYLAND" = "yes" ]; then
-	PKGDEPENDS="graphics/wayland $PKGDEPENDS"
+	PKGDEPENDS="wayland $PKGDEPENDS"
 	with_wayland="--enable-wayland"
 else
 	with_wayland="--disable-wayland"
--- a/lib/libxklavier/libxklavier.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/libxklavier/libxklavier.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,12 +21,12 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="utility library to make XKB stuff easier"
 PKGDOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/$PKGNAME/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib
-            text/libxml2
-            x11/libx11
-            x11/libxi
-            x11/libxkbfile
-            x11/xmodmap"
+PKGDEPENDS="glib
+            libxml2
+            libx11
+            libxi
+            libxkbfile
+            xmodmap"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/lib/mpfr/mpfr.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/mpfr/mpfr.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv3+"
 PKGSUMMARY="multiple-precision floating-point library in C"
 PKGDOWNLOAD="https://www.mpfr.org/$PKGNAME-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/gmp"
+PKGDEPENDS="gmp"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lib/musl/musl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/musl/musl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT"
 PKGSUMMARY="a new lightweight, fast, simple, free and correct C library"
 PKGDOWNLOAD="https://www.musl-libc.org/releases/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/linux-headers:build"
+PKGDEPENDS="linux-headers:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/lib/pcre/pcre.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/pcre/pcre.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD"
 PKGSUMMARY="perl 5 regular expression library"
 PKGDOWNLOAD="https://ftp.pcre.org/pub/pcre/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="compression/zlib"
+PKGDEPENDS="zlib"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lib/pcre2/pcre2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/pcre2/pcre2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD"
 PKGSUMMARY="perl 5 regular expression library (2nd version)"
 PKGDOWNLOAD="https://ftp.pcre.org/pub/pcre/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="compression/zlib"
+PKGDEPENDS="zlib"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -38,7 +38,7 @@
 	tar xvf $PKGNAME-$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
-	# --enable-pcre2-(16|32): some packages require this (e.g. qt/qtbase)
+	# --enable-pcre2-(16|32): some packages require this (e.g. qtbase)
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	CXX="$CXX" \
--- a/lib/popt/popt.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/popt/popt.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/lib/readline/readline.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/readline/readline.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3"
 PKGSUMMARY="GNU readline"
 PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/ncurses"
+PKGDEPENDS="ncurses"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lib/sdl2/sdl2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/sdl2/sdl2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -109,7 +109,7 @@
 fi
 
 if [ "$DBUS" = "yes" ]; then
-	PKGDEPENDS="network/dbus $PKGDEPENDS"
+	PKGDEPENDS="dbus $PKGDEPENDS"
 	with_dbus="--enable-dbus"
 else
 	with_dbus="--disable-dbus"
@@ -177,14 +177,14 @@
 fi
 
 if [ "$KMS" = "yes" ]; then
-	PKGDEPENDS="graphics/libdrm $PKGDEPENDS"
+	PKGDEPENDS="libdrm $PKGDEPENDS"
 	with_kms="--enable-video-kmsdrm"
 else
 	with_kms="--disable-video-kmsdrm"
 fi
 
 if [ "$OPENGL" = "yes" ]; then
-	PKGDEPENDS="graphics/mesa $PKGDEPENDS"
+	PKGDEPENDS="mesa $PKGDEPENDS"
 	with_opengl="--enable-video-opengl"
 else
 	with_opengl="--disable-video-opengl"
@@ -203,7 +203,7 @@
 fi
 
 if [ "$PULSEAUDIO" = "yes" ]; then
-	PKGDEPENDS="audio/pulseaudio $PKGDEPENDS"
+	PKGDEPENDS="pulseaudio $PKGDEPENDS"
 	with_pulseaudio="--enable-pulseaudio"
 else
 	with_pulseaudio="--disable-pulseaudio"
@@ -246,11 +246,11 @@
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libxext
-	            x11/libxcursor
-	            x11/libxinerama
-	            x11/libxrandr
-	            x11/libxscrnsaver
+	PKGDEPENDS="libxext
+	            libxcursor
+	            libxinerama
+	            libxrandr
+	            libxscrnsaver
 	            x1/libxi $PKGDEPENDS"
 	with_x="--enable-video-x11"
 	with_x="--enable-video-x11-scrnsaver $with_x"
--- a/lib/vte/vte.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/lib/vte/vte.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,10 +21,10 @@
 PKGLICENSE="LGPLv20+"
 PKGSUMMARY="library provisioning a virtual terminal emulator widget"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/0.56/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="crypto/gnutls
-            dev/gobject-introspection
-            graphics/gtk
-            lib/pcre2"
+PKGDEPENDS="gnutls
+            gobject-introspection
+            gtk
+            pcre2"
 PKGOPTIONS="VALA"
 
 : ${CHOST:=$(uname -m)-linux-musl}
--- a/mail/neomutt/neomutt.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mail/neomutt/neomutt.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="mutt fork with more features"
 PKGDOWNLOAD="https://github.com/neomutt/neomutt/archive/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="core/gettext lang/tcl:build lib/ncurses text/libxslt:build www/w3m:build"
+PKGDEPENDS="gettext tcl:build ncurses libxslt:build www/w3m:build"
 PKGOPTIONS="IDN2 NLS NOTMUCH SSL"
 PKGPROTECT="etc/neomuttrc"
 
@@ -30,13 +30,13 @@
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}
-: ${IDN2:=yes}                  # TODO: not upstream default, change once dns/libidn is available.
+: ${IDN2:=yes}                  # TODO: not upstream default, change once libidn is available.
 : ${NLS:=yes}
 : ${NOTMUCH:=no}
 : ${SSL:=openssl}               # openssl or gnutls
 
 if [ "$IDN2" = "yes" ]; then
-	PKGDEPENDS="dns/libidn2 $PKGDEPENDS"
+	PKGDEPENDS="libidn2 $PKGDEPENDS"
 	with_idn2="--disable-idn --idn2"
 fi
 
@@ -49,10 +49,10 @@
 fi
 
 if [ "$SSL" = "openssl" ]; then
-	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
+	PKGDEPENDS="libressl $PKGDEPENDS"
 	with_ssl="--ssl"
 elif [ "$SSL" = "gnutls" ]; then
-	PKGDEPENDS="crypto/gnutls $PKGDEPENDS"
+	PKGDEPENDS="gnutls $PKGDEPENDS"
 	with_ssl="--gnutls"
 fi
 
--- a/mate/libmatekbd/libmatekbd.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/libmatekbd/libmatekbd.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="MATE keyboard library"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib graphics/gtk"
+PKGDEPENDS="glib gtk"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/mate/libmatemixer/libmatemixer.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/libmatemixer/libmatemixer.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -33,14 +33,14 @@
 : ${PULSEAUDIO:=yes}
 
 if [ "$ALSA" = "yes" ]; then
-	PKGDEPENDS="audio/alsa-lib $PKGDEPENDS"
+	PKGDEPENDS="alsa-lib $PKGDEPENDS"
 	with_alsa="--enable-alsa"
 else
 	with_alsa="--disable-alsa"
 fi
 
 if [ "$PULSEAUDIO" = "yes" ]; then
-	PKGDEPENDS="audio/pulseaudio $PKGDEPENDS"
+	PKGDEPENDS="pulseaudio $PKGDEPENDS"
 	with_pulseaudio="--enable-pulseaudio"
 else
 	with_pulseaudio="--disable-pulseaudio"
--- a/mate/libmateweather/libmateweather.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/libmateweather/libmateweather.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,10 +21,10 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="MATE weather library"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="graphics/gtk
-            lib/glib
-            network/libsoup
-            text/libxml2"
+PKGDEPENDS="gtk
+            glib
+            libsoup
+            libxml2"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/mate/marco/marco.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/marco/marco.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,19 +21,19 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="MATE window manager"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="desktop/startup-notification
-            graphics/gdk-pixbuf
-            graphics/gtk
-            lib/glib
-            x11/libsm
-            x11/libx11
-            x11/libxcomposite
-            x11/libxcursor
-            x11/libxinerama
-            x11/libxkbfile
-            x11/libxpresent
-            x11/libxrandr
-            x11/libxrender"
+PKGDEPENDS="startup-notification
+            gdk-pixbuf
+            gtk
+            glib
+            libsm
+            libx11
+            libxcomposite
+            libxcursor
+            libxinerama
+            libxkbfile
+            libxpresent
+            libxrandr
+            libxrender"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/mate/mate-calc/mate-calc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/mate-calc/mate-calc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="MATE calculator"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib graphics/gtk misc/itstool:build"
+PKGDEPENDS="glib gtk itstool:build"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/mate/mate-desktop/mate-desktop.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/mate-desktop/mate-desktop.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2 LGPLv20"
 PKGSUMMARY="MATE common libraries"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib dev/gobject-introspection graphics/gtk"
+PKGDEPENDS="glib gobject-introspection gtk"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/mate/mate-icon-theme/mate-icon-theme.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/mate-icon-theme/mate-icon-theme.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv3 CC-BY-SAv3"
 PKGSUMMARY="MATE icon theme"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="desktop/icon-naming-utils"
+PKGDEPENDS="icon-naming-utils"
 
 build()
 {
--- a/mate/mate-menus/mate-menus.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/mate-menus/mate-menus.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2 LGPLv2"
 PKGSUMMARY="MATE libraries and files for menus"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib"
+PKGDEPENDS="glib"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/mate/mate-panel/mate-panel.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/mate-panel/mate-panel.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,16 +21,16 @@
 PKGLICENSE="GPLv2 LGPLv20 GFDLv11"
 PKGSUMMARY="MATE panel"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="desktop/dconf
-            desktop/libwnck
-            fonts/pango
-            graphics/gdk-pixbuf
-            graphics/gtk
-            graphics/librsvg
-            lib/glib
-            mate/libmateweather
-            mate/mate-desktop
-            mate/mate-menus"
+PKGDEPENDS="dconf
+            libwnck
+            pango
+            gdk-pixbuf
+            gtk
+            librsvg
+            glib
+            libmateweather
+            mate-desktop
+            mate-menus"
 PKGOPTIONS="WAYLAND X"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -43,14 +43,14 @@
 : ${X:=yes}
 
 if [ "$WAYLAND" = "yes" ]; then
-	PKGDEPENDS="graphics/wayland $PKGDEPENDS"
+	PKGDEPENDS="wayland $PKGDEPENDS"
 	with_wayland="--enable-wayland"
 else
 	with_wayland="--disable-wayland"
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libx11 x11/libxau $PKGDEPENDS"
+	PKGDEPENDS="libx11 libxau $PKGDEPENDS"
 	with_x="--enable-x11"
 else
 	with_x="--disable-x11"
--- a/mate/mate-polkit/mate-polkit.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/mate-polkit/mate-polkit.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="MATE polkit support"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS=" graphics/gtk lib/glib security/polkit system/accountsservice"
+PKGDEPENDS=" gtk glib polkit accountsservice"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/mate/mate-session-manager/mate-session-manager.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/mate-session-manager/mate-session-manager.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,18 +21,18 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="MATE session manager"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="graphics/gtk
-            lib/dbus-glib
-            lib/glib
-            perl/perl:build
-            x11/libice
-            x11/libsm
-            x11/libx11
-            x11/libxau
-            x11/libxext
-            x11/libxrender
-            x11/libxtst
-            x11/xtrans"
+PKGDEPENDS="gtk
+            dbus-glib
+            glib
+            perl:build
+            libice
+            libsm
+            libx11
+            libxau
+            libxext
+            libxrender
+            libxtst
+            xtrans"
 PKGOPTIONS="IPV6"
 
 : ${CHOST:=$(uname -m)-linux-musl}
--- a/mate/mate-settings-daemon/mate-settings-daemon.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/mate-settings-daemon/mate-settings-daemon.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,16 +21,16 @@
 PKGLICENSE="GPLv2 LGPLv21"
 PKGSUMMARY="MATE settings daemon"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="desktop/libnotify
-            fonts/fontconfig
-            graphics/gtk
-            lib/dbus-glib
-            lib/glib
-            mate/libmatekbd
-            mate/mate-desktop
-            x11/libxext
-            x11/libxi
-            x11/libxxf86misc"
+PKGDEPENDS="libnotify
+            fontconfig
+            gtk
+            dbus-glib
+            glib
+            libmatekbd
+            mate-desktop
+            libxext
+            libxi
+            libxxf86misc"
 PKGOPTIONS="AUDIO POLKIT PULSEAUDIO"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -43,21 +43,21 @@
 : ${POLKIT:=yes}
 
 if [ "$AUDIO" = "yes" ]; then
-	PKGDEPENDS="mate/libmatemixer $PKGDEPENDS"
+	PKGDEPENDS="libmatemixer $PKGDEPENDS"
 	with_audio="--with-libmatemixer"
 else
 	with_audio="--without-libmatemixer"
 fi
 
 if [ "$POLKIT" = "yes" ]; then
-	PKGDEPENDS="security/polkit $PKGDEPENDS"
+	PKGDEPENDS="polkit $PKGDEPENDS"
 	with_polkit="--enable-polkit"
 else
 	with_polkit="--disable-polkit"
 fi
 
 if [ "$PULSEAUDIO" = "yes" ]; then
-	PKGDEPENDS="audio/pulseaudio $PKGDEPENDS"
+	PKGDEPENDS="pulseaudio $PKGDEPENDS"
 	with_pulseaudio="--enable-pulse"
 else
 	with_pulseaudio="--disable-pulse"
--- a/mate/mate-terminal/mate-terminal.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/mate/mate-terminal/mate-terminal.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,12 +21,12 @@
 PKGLICENSE="GPLv3"
 PKGSUMMARY="MATE terminal"
 PKGDOWNLOAD="https://pub.mate-desktop.org/releases/1.22/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="desktop/dconf
-            graphics/gtk
-            lib/glib
-            lib/vte
-            x11/libsm
-            x11/libx11"
+PKGDEPENDS="dconf
+            gtk
+            glib
+            vte
+            libsm
+            libx11"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/misc/gsettings-desktop-schemas/gsettings-desktop-schemas.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/misc/gsettings-desktop-schemas/gsettings-desktop-schemas.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="one of README.licenses.md or CUSTOM"
 PKGSUMMARY="short summary"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build"
+PKGDEPENDS="meson:build"
 PKGOPTIONS="INTROSPECTION"
 
 : ${CC:=clang}
@@ -32,7 +32,7 @@
 : ${INTROSPECTION:=yes}
 
 if [ "$INTROSPECTION" = "yes" ]; then
-	PKGDEPENDS="dev/gobject-introspection $PKGDEPENDS"
+	PKGDEPENDS="gobject-introspection $PKGDEPENDS"
 	with_introspection="-D introspection=true"
 else
 	with_introspection="-D introspection=false"
--- a/misc/iso-codes/iso-codes.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/misc/iso-codes/iso-codes.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="ISO codes and their translations"
 PKGDOWNLOAD="https://salsa.debian.org/iso-codes-team/$PKGNAME/uploads/049ce6aac94d842be809f4063950646c/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="core/gettext"
+PKGDEPENDS="gettext"
 
 build()
 {
--- a/misc/itstool/itstool.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/misc/itstool/itstool.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3+"
 PKGSUMMARY="translate XML documents with PO files"
 PKGDOWNLOAD="http://files.itstool.org/$PKGNAME/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/libxml2 python/python"
+PKGDEPENDS="libxml2 python"
 
 build()
 {
--- a/misc/shared-mime-info/shared-mime-info.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/misc/shared-mime-info/shared-mime-info.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="mime database"
 PKGDOWNLOAD="http://freedesktop.org/~hadess/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib text/libxml2"
+PKGDEPENDS="glib libxml2"
 PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/multimedia/ffmpeg/ffmpeg.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/ffmpeg/ffmpeg.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -104,42 +104,42 @@
 : ${ZLIB:=no}
 
 if [ "$ALSA" = "yes" ]; then
-	PKGDEPENDS="audio/alsa-lib $PKGDEPENDS"
+	PKGDEPENDS="alsa-lib $PKGDEPENDS"
 	with_alsa="--enable-alsa"
 else
 	with_alsa="--disable-alsa"
 fi
 
 if [ "$BLURAY" = "yes" ]; then
-	PKGDEPENDS="multimedia/libbluray $PKGDEPENDS"
+	PKGDEPENDS="libbluray $PKGDEPENDS"
 	with_bluray="--enable-libbluray"
 else
 	with_bluray="--disable-libbluray"
 fi
 
 if [ "$BZIP2" = "yes" ]; then
-	PKGDEPENDS="compression/bzip2 $PKGDEPENDS"
+	PKGDEPENDS="bzip2 $PKGDEPENDS"
 	with_bzip2="--enable-bzlib"
 else
 	with_bzip2="--disable-bzlib"
 fi
 
 if [ "$CRYPTO" = "yes" ]; then
-	PKGDEPENDS="crypto/libgcrypt $PKGDEPENDS"
+	PKGDEPENDS="libgcrypt $PKGDEPENDS"
 	with_crypto="--enable-gcrypt"
 else
 	with_crypto="--disable-gcrypt"
 fi
 
 if [ "$FONTCONFIG" = "yes" ]; then
-	PKGDEPENDS="fonts/fontconfig $PKGDEPENDS"
+	PKGDEPENDS="fontconfig $PKGDEPENDS"
 	with_fontconfig="--enable-fontconfig"
 else
 	with_fontconfig="--disable-fontconfig"
 fi
 
 if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="fonts/freetype $PKGDEPENDS"
+	PKGDEPENDS="freetype $PKGDEPENDS"
 	with_freetype="--enable-libfreetype"
 else
 	with_freetype="--disable-libfreetype"
@@ -153,7 +153,7 @@
 fi
 
 if [ "$GMP" = "yes" ]; then
-	PKGDEPENDS="lib/gmp $PKGDEPENDS"
+	PKGDEPENDS="gmp $PKGDEPENDS"
 	with_gmp="--enable-gmp"
 else
 	with_gmp="--disable-gmp"
@@ -167,101 +167,101 @@
 fi
 
 if [ "$LZMA" = "yes" ]; then
-	PKGDEPENDS="compression/xz $PKGDEPENDS"
+	PKGDEPENDS="xz $PKGDEPENDS"
 	with_lzma="--enable-lzma"
 else
 	with_lzma="--disable-lzma"
 fi
 
 if [ "$MP3" = "yes" ]; then
-	PKGDEPENDS="audio/lame $PKGDEPENDS"
+	PKGDEPENDS="lame $PKGDEPENDS"
 	with_mp3="--enable-libmp3lame"
 else
 	with_mp3="--disable-libmp3lame"
 fi
 
 if [ "$OPENGL" = "yes" ]; then
-	PKGDEPENDS="graphics/mesa $PKGDEPENDS"
+	PKGDEPENDS="mesa $PKGDEPENDS"
 	with_opengl="--enable-opengl"
 else
 	with_opengl="--disable-opengl"
 fi
 
 if [ "$OPUS" = "yes" ]; then
-	PKGDEPENDS="audio/opus $PKGDEPENDS"
+	PKGDEPENDS="opus $PKGDEPENDS"
 	with_opus="--enable-libopus"
 else
 	with_opus="--disable-libopus"
 fi
 
 if [ "$PULSEAUDIO" = "yes" ]; then
-	PKGDEPENDS="audio/pulseaudio $PKGDEPENDS"
+	PKGDEPENDS="pulseaudio $PKGDEPENDS"
 	with_pulseaudio="--enable-libpulse"
 else
 	with_pulseaudio="--disable-libpulse"
 fi
 
 if [ "$SPEEX" = "yes" ]; then
-	PKGDEPENDS="audio/speex $PKGDEPENDS"
+	PKGDEPENDS="speex $PKGDEPENDS"
 	with_speex="--enable-libspeex"
 else
 	with_speex="--disable-libspeex"
 fi
 
 if [ "$SSH" = "yes" ]; then
-	PKGDEPENDS="network/libssh $PKGDEPENDS"
+	PKGDEPENDS="libssh $PKGDEPENDS"
 	with_ssh="--enable-libssh"
 else
 	with_ssh="--disable-libssh"
 fi
 
 if [ "$SSL" = "yes" ] || [ "$SSL" = "libressl" ]; then
-	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
+	PKGDEPENDS="libressl $PKGDEPENDS"
 	with_ssl="--enable-libtls"
 elif [ "$SSL" = "gnutls" ]; then
-	PKGDEPENDS="crypto/gnutls $PKGDEPENDS"
+	PKGDEPENDS="gnutls $PKGDEPENDS"
 	with_ssl="--enable-gnutls"
 else
 	with_ssl="--disable-gnutls --disable-libtls --disable-openssl --disable-mbedtls"
 fi
 
 if [ "$SVG" = "yes" ]; then
-	PKGDEPENDS="graphics/librsvg $PKGDEPENDS"
+	PKGDEPENDS="librsvg $PKGDEPENDS"
 	with_svg="--enable-librsvg"
 else
 	with_svg="--disable-librsvg"
 fi
 
 if [ "$THEORA" = "yes" ]; then
-	PKGDEPENDS="multimedia/libtheora $PKGDEPENDS"
+	PKGDEPENDS="libtheora $PKGDEPENDS"
 	with_theora="--enable-libtheora"
 else
 	with_theora="--disable-libtheora"
 fi
 
 if [ "$VORBIS" = "yes" ]; then
-	PKGDEPENDS="audio/libvorbis $PKGDEPENDS"
+	PKGDEPENDS="libvorbis $PKGDEPENDS"
 	with_vorbis="--enable-libvorbis"
 else
 	with_vorbis="--disable-libvorbis"
 fi
 
 if [ "$WEBP" = "yes" ]; then
-	PKGDEPENDS="graphics/libwebp $PKGDEPENDS"
+	PKGDEPENDS="libwebp $PKGDEPENDS"
 	with_webp="--enable-libwebp"
 else
 	with_webp="--disable-libwebp"
 fi
 
 if [ "$X265" = "yes" ]; then
-	PKGDEPENDS="multimedia/x265 $PKGDEPENDS"
+	PKGDEPENDS="x265 $PKGDEPENDS"
 	with_x265="--enable-libx265"
 else
 	with_x265="--disable-libx265"
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libx11 x11/libxcb $PKGDEPENDS"
+	PKGDEPENDS="libx11 libxcb $PKGDEPENDS"
 	with_x="--enable-xlib"
 	with_x="--enable-libxcb $with_x"
 	with_x="--enable-libxcb-shm $with_x"
@@ -276,14 +276,14 @@
 fi
 
 if [ "$XML" = "yes" ]; then
-	PKGDEPENDS="text/libxml2 $PKGDEPENDS"
+	PKGDEPENDS="libxml2 $PKGDEPENDS"
 	with_xml="--enable-libxml2"
 else
 	with_xml="--disable-libxml2"
 fi
 
 if [ "$ZLIB" = "yes" ]; then
-	PKGDEPENDS="compression/zlib $PKGDEPENDS"
+	PKGDEPENDS="zlib $PKGDEPENDS"
 	with_zlib="--enable-zlib"
 else
 	with_zlib="--disable-zlib"
--- a/multimedia/gst-libav/gst-libav.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/gst-libav/gst-libav.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="gstreamer ffmpeg plugin"
 PKGDOWNLOAD="https://gstreamer.freedesktop.org/src/gst-libav/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build multimedia/gstreamer multimedia/ffmpeg"
+PKGDEPENDS="meson:build gstreamer ffmpeg"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/multimedia/gst-plugins-bad/gst-plugins-bad.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/gst-plugins-bad/gst-plugins-bad.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -23,7 +23,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="gstreamer bad plugins"
 PKGDOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build multimedia/gstreamer"
+PKGDEPENDS="meson:build gstreamer"
 PKGOPTIONS="BLUETOOTH BZIP2 CURL DVD FAAC FAAD H264 JPEG KMS OPENAL SNDFILE WAYLAND X"
 
 : ${CC:=clang}
@@ -46,91 +46,91 @@
 : ${X:=yes}
 
 if [ "$BLUETOOTH" = "yes" ]; then
-	PKGDEPENDS="bluetooth/bluez $PKGDEPENDS"
+	PKGDEPENDS="bluez $PKGDEPENDS"
 	with_bluetooth="-D bluez=enabled"
 else
 	with_bluetooth="-D bluez=disabled"
 fi
 
 if [ "$BZIP2" = "yes" ]; then
-	PKGDEPENDS="compression/bzip2 $PKGDEPENDS"
+	PKGDEPENDS="bzip2 $PKGDEPENDS"
 	with_bzip2="-D bz2=enabled"
 else
 	with_bzip2="-D bz2=disabled"
 fi
 
 if [ "$CURL" = "yes" ]; then
-	PKGDEPENDS="network/curl $PKGDEPENDS"
+	PKGDEPENDS="curl $PKGDEPENDS"
 	with_curl="-D curl=enabled"
 else
 	with_curl="-D curl=disabled"
 fi
 
 if [ "$DVD" = "yes" ]; then
-	PKGDEPENDS="multimedia/libdvdnav multimedia/libdvdread $PKGDEPENDS"
+	PKGDEPENDS="libdvdnav libdvdread $PKGDEPENDS"
 	with_dvd="-D resindvd=enabled"
 else
 	with_dvd="-D resindvd=disabled"
 fi
 
 if [ "$FAAC" = "yes" ]; then
-	PKGDEPENDS="audio/faac $PKGDEPENDS"
+	PKGDEPENDS="faac $PKGDEPENDS"
 	with_faac="-D faac=enabled"
 else
 	with_faac="-D faac=disabled"
 fi
 
 if [ "$FAAD" = "yes" ]; then
-	PKGDEPENDS="audio/faad2 $PKGDEPENDS"
+	PKGDEPENDS="faad2 $PKGDEPENDS"
 	with_faac="-D faad=enabled"
 else
 	with_faac="-D faad=disabled"
 fi
 
 if [ "$H264" = "yes" ]; then
-	PKGDEPENDS="multimedia/openh264 $PKGDEPENDS"
+	PKGDEPENDS="openh264 $PKGDEPENDS"
 	with_h264="-D openh264=enabled"
 else
 	with_h264="-D openh264=disabled"
 fi
 
 if [ "$JPEG" = "yes" ]; then
-	PKGDEPENDS="graphics/openjpeg $PKGDEPENDS"
+	PKGDEPENDS="openjpeg $PKGDEPENDS"
 	with_jpeg="-D openjpeg=enabled"
 else
 	with_jpeg="-D openjpeg=disabled"
 fi
 
 if [ "$KMS" = "yes" ]; then
-	PKGDEPENDS="graphics/libdrm $PKGDEPENDS"
+	PKGDEPENDS="libdrm $PKGDEPENDS"
 	with_kms="-D kms=enabled"
 else
 	with_kms="-D kms=disabled"
 fi
 
 if [ "$OPENAL" = "yes" ]; then
-	PKGDEPENDS="audio/openal-soft $PKGDEPENDS"
+	PKGDEPENDS="openal-soft $PKGDEPENDS"
 	with_openal="-D openal=enabled"
 else
 	with_openal="-D openal=disabled"
 fi
 
 if [ "$SNDFILE" = "yes" ]; then
-	PKGDEPENDS="audio/libsndfile $PKGDEPENDS"
+	PKGDEPENDS="libsndfile $PKGDEPENDS"
 	with_sndfile="-D sndfile=enabled"
 else
 	with_sndfile="-D sndfile=disabled"
 fi
 
 if [ "$WAYLAND" = "yes" ]; then
-	PKGDEPENDS="graphics/wayland graphics/wayland-protocols $PKGDEPENDS"
+	PKGDEPENDS="wayland wayland-protocols $PKGDEPENDS"
 	with_wayland="-D wayland=enabled"
 else
 	with_wayland="-D wayland=disabled"
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libx11 $PKGDEPENDS"
+	PKGDEPENDS="libx11 $PKGDEPENDS"
 	with_x="-D x11=enabled"
 else
 	with_x="-D x11=disabled"
--- a/multimedia/gst-plugins-base/gst-plugins-base.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/gst-plugins-base/gst-plugins-base.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -23,7 +23,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="gstreamer base plugins"
 PKGDOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-base/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build multimedia/gstreamer"
+PKGDEPENDS="meson:build gstreamer"
 PKGOPTIONS="ALSA CDPARANOIA PANGO NLS OGG OPUS THEORA VORBIS X"
 
 : ${CC:=clang}
@@ -41,56 +41,56 @@
 : ${X:=yes}
 
 if [ "$ALSA" = "yes" ]; then
-	PKGDEPENDS="audio/alsa-lib $PKGDEPENDS"
+	PKGDEPENDS="alsa-lib $PKGDEPENDS"
 	with_alsa="-D alsa=enabled"
 else
 	with_alsa="-D alsa=disabled"
 fi
 
 if [ "$CDPARANOIA" = "yes" ]; then
-	PKGDEPENDS="audio/cdparanoia $PKGDEPENDS"
+	PKGDEPENDS="cdparanoia $PKGDEPENDS"
 	with_cdparanoia="-D cdparanoia=enabled"
 else
 	with_cdparanoia="-D cdparanoia=disabled"
 fi
 
 if [ "$PANGO" = "yes" ]; then
-	PKGDEPENDS="fonts/pango $PKGDEPENDS"
+	PKGDEPENDS="pango $PKGDEPENDS"
 	with_pango="-D pango=enabled"
 else
 	with_pango="-D pango=disabled"
 fi
 
 if [ "$OGG" = "yes" ]; then
-	PKGDEPENDS="audio/libogg $PKGDEPENDS"
+	PKGDEPENDS="libogg $PKGDEPENDS"
 	with_ogg="-D ogg=enabled"
 else
 	with_ogg="-D ogg=disabled"
 fi
 
 if [ "$OPUS" = "yes" ]; then
-	PKGDEPENDS="audio/opus $PKGDEPENDS"
+	PKGDEPENDS="opus $PKGDEPENDS"
 	with_opus="-D opus=enabled"
 else
 	with_opus="-D opus=disabled"
 fi
 
 if [ "$THEORA" = "yes" ]; then
-	PKGDEPENDS="multimedia/libtheora $PKGDEPENDS"
+	PKGDEPENDS="libtheora $PKGDEPENDS"
 	with_theora="-D theora=enabled"
 else
 	with_theora="-D theora=disabled"
 fi
 
 if [ "$VORBIS" = "yes" ]; then
-	PKGDEPENDS="audio/libvorbis $PKGDEPENDS"
+	PKGDEPENDS="libvorbis $PKGDEPENDS"
 	with_vorbis="-D vorbis=enabled"
 else
 	with_vorbis="-D vorbis=disabled"
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libxshmfence $PKGDEPENDS"
+	PKGDEPENDS="libxshmfence $PKGDEPENDS"
 	with_x="-D x11=enabled -Dxshm=enabled"
 else
 	with_x="-D x11=disabled -Dxshm=disabled"
--- a/multimedia/gst-plugins-good/gst-plugins-good.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/gst-plugins-good/gst-plugins-good.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="gstreamer good plugins"
 PKGDOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-good/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build multimedia/gstreamer"
+PKGDEPENDS="meson:build gstreamer"
 PKGOPTIONS="BZIP2 CAIRO FLAC GTK JACK JPEG LAME LIBSOUP NLS OSS PNG PULSEAUDIO QT X"
 
 : ${CC:=clang}
@@ -45,28 +45,28 @@
 : ${X:=yes}
 
 if [ "$BZIP2" = "yes" ]; then
-	PKGDEPENDS="compression/bzip2 $PKGDEPENDS"
+	PKGDEPENDS="bzip2 $PKGDEPENDS"
 	with_bzip2="-D bz2=enabled"
 else
 	with_bzip2="-D bz2=disabled"
 fi
 
 if [ "$CAIRO" = "yes" ]; then
-	PKGDEPENDS="graphics/cairo $PKGDEPENDS"
+	PKGDEPENDS="cairo $PKGDEPENDS"
 	with_cairo="-D cairo=enabled"
 else
 	with_cairo="-D cairo=disabled"
 fi
 
 if [ "$FLAC" = "yes" ]; then
-	PKGDEPENDS="audio/flac $PKGDEPENDS"
+	PKGDEPENDS="flac $PKGDEPENDS"
 	with_flac="-D flac=enabled"
 else
 	with_flac="-D flac=disabled"
 fi
 
 if [ "$GTK" = "yes" ]; then
-	PKGDEPENDS="graphics/gtk graphics/gdk-pixbuf $PKGDEPENDS"
+	PKGDEPENDS="gtk gdk-pixbuf $PKGDEPENDS"
 	with_gtk="-D gtk3=enabled -D gdk-pixbuf=enabled"
 else
 	with_gtk="-D gtk3=disabled -D gdk-pixbuf=disabled"
@@ -80,28 +80,28 @@
 fi
 
 if [ "$JPEG" = "yes" ]; then
-	PKGDEPENDS="graphics/libjpeg-turbo $PKGDEPENDS"
+	PKGDEPENDS="libjpeg-turbo $PKGDEPENDS"
 	with_jpeg="-D jpeg=enabled"
 else
 	with_jpeg="-D jpeg=disabled"
 fi
 
 if [ "$LAME" = "yes" ]; then
-	PKGDEPENDS="audio/lame $PKGDEPENDS"
+	PKGDEPENDS="lame $PKGDEPENDS"
 	with_lame="-D lame=enabled"
 else
 	with_lame="-D lame=disabled"
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="-D nls=enabled"
 else
 	with_nls="-D nls=disabled"
 fi
 
 if [ "$OSS" = "yes" ]; then
-	PKGDEPENDS="lib/linux-headers:build $PKGDEPENDS"
+	PKGDEPENDS="linux-headers:build $PKGDEPENDS"
 	with_oss="-D oss=enabled"
 else
 	with_oss="-D oss=disabled"
@@ -115,31 +115,31 @@
 fi
 
 if [ "$PULSEAUDIO" = "yes" ]; then
-	PKGDEPENDS="audio/pulseaudio $PKGDEPENDS"
+	PKGDEPENDS="pulseaudio $PKGDEPENDS"
 	with_pulseaudio="-D pulse=enabled"
 else
 	with_pulseaudio="-D pulse=disabled"
 fi
 
 if [ "$QT" = "yes" ]; then
-	PKGDEPENDS="qt/qtbase $PKGDEPENDS"
+	PKGDEPENDS="qtbase $PKGDEPENDS"
 	with_qt="-D qt5=enabled"
 else
 	with_qt="-D qt5=disabled"
 fi
 
 if [ "$LIBSOUP" = "yes" ]; then
-	PKGDEPENDS="network/libsoup $PKGDEPENDS"
+	PKGDEPENDS="libsoup $PKGDEPENDS"
 	with_libsoup="-D soup=enabled"
 else
 	with_libsoup="-D soup=disabled"
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libx11
-	            x11/libxdamage
-	            x11/libxext
-	            x11/libxfixes $PKGDEPENDS"
+	PKGDEPENDS="libx11
+	            libxdamage
+	            libxext
+	            libxfixes $PKGDEPENDS"
 	with_x="-D ximagesrc=enabled"
 	with_x="-D ximagesrc-xshm=enabled $with_x"
 	with_x="-D ximagesrc-xfixes=enabled $with_x"
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="gstreamer ugly plugins"
 PKGDOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build multimedia/gstreamer"
+PKGDEPENDS="meson:build gstreamer"
 PKGOPTIONS="CDIO DVD H264"
 
 : ${CC:=clang}
@@ -34,21 +34,21 @@
 : ${H264:=yes}
 
 if [ "$CDIO" = "yes" ]; then
-	PKGDEPENDS="multimedia/libcdio $PKGDEPENDS"
+	PKGDEPENDS="libcdio $PKGDEPENDS"
 	with_cdio="-D cdio=enabled"
 else
 	with_cdio="-D cdio=disabled"
 fi
 
 if [ "$DVD" = "yes" ]; then
-	PKGDEPENDS="multimedia/libdvdread $PKGDEPENDS"
+	PKGDEPENDS="libdvdread $PKGDEPENDS"
 	with_dvd="-D dvdread=enabled"
 else
 	with_dvd="-D dvdread=disabled"
 fi
 
 if [ "$H264" = "yes" ]; then
-	PKGDEPENDS="multimedia/x264 $PKGDEPENDS"
+	PKGDEPENDS="x264 $PKGDEPENDS"
 	with_h264="-D x264=enabled"
 else
 	with_h264="-D x264=disabled"
--- a/multimedia/gstreamer/gstreamer.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/gstreamer/gstreamer.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="multimedia streaming framework"
 PKGDOWNLOAD="https://gstreamer.freedesktop.org/src/gstreamer/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build lib/glib"
+PKGDEPENDS="meson:build glib"
 PKGOPTIONS="INTROSPECTION NLS"
 
 : ${CC:=clang}
@@ -31,14 +31,14 @@
 : ${NLS:=yes}
 
 if [ "$INTROSPECTION" = "yes" ]; then
-	PKGDEPENDS="dev/gobject-introspection:build $PKGDEPENDS"
+	PKGDEPENDS="gobject-introspection:build $PKGDEPENDS"
 	with_introspection="-D introspection=enabled"
 else
 	with_introspection="-D introspection=disabled"
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="-D nls=enabled"
 else
 	with_nls="-D nls=disabled"
--- a/multimedia/libbluray/libbluray.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/libbluray/libbluray.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -34,21 +34,21 @@
 : ${XML:=yes}
 
 if [ "$FONTCONFIG" = "yes" ]; then
-	PKGDEPENDS="fonts/fontconfig $PKGDEPENDS"
+	PKGDEPENDS="fontconfig $PKGDEPENDS"
 	with_fontconfig="--with-fontconfig"
 else
 	with_fontconfig="--without-fontconfig"
 fi
 
 if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="fonts/freetype $PKGDEPENDS"
+	PKGDEPENDS="freetype $PKGDEPENDS"
 	with_freetype="--with-freetype"
 else
 	with_freetype="--without-freetype"
 fi
 
 if [ "$XML" = "yes" ]; then
-	PKGDEPENDS="text/libxml2 $PKGDEPENDS"
+	PKGDEPENDS="libxml2 $PKGDEPENDS"
 	with_xml="--with-libxml2"
 else
 	with_xml="--without-libxml2"
--- a/multimedia/libdvdnav/libdvdnav.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/libdvdnav/libdvdnav.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="library that allows easy use of sophisticated DVD navigation"
 PKGDOWNLOAD="http://download.videolan.org/pub/videolan/libdvdnav/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="multimedia/libdvdread"
+PKGDEPENDS="libdvdread"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/multimedia/libdvdread/libdvdread.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/libdvdread/libdvdread.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="simple library for reading DVD video disks"
 PKGDOWNLOAD="http://download.videolan.org/pub/videolan/$PKGNAME/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="multimedia/libdvdcss"
+PKGDEPENDS="libdvdcss"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/multimedia/libtheora/libtheora.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/libtheora/libtheora.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="an open video codec"
 PKGDOWNLOAD="http://downloads.xiph.org/releases/theora/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="audio/libogg audio/libvorbis"
+PKGDEPENDS="libogg libvorbis"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/multimedia/openh264/openh264.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/openh264/openh264.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD2CLAUSE"
 PKGSUMMARY="opensource H.264 codec from cisco"
 PKGDOWNLOAD="https://github.com/cisco/$PKGNAME/archive/v$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/meson:build"
+PKGDEPENDS="meson:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/multimedia/x264/x264.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/x264/x264.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -30,7 +30,7 @@
 : ${FFMPEG:=yes}
 
 if [ "$FFMPEG" = "yes" ]; then
-	PKGDEPENDS="multimedia/ffmpeg $PKGDEPENDS"
+	PKGDEPENDS="ffmpeg $PKGDEPENDS"
 	with_ffmpeg="--enable-swscale --enable-lavf"
 else
 	with_ffmpeg="--disable-swscale --disable-lavf"
--- a/multimedia/x265/x265.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/x265/x265.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="H265 video codec"
 PKGDOWNLOAD="https://bitbucket.org/multicoreware/x265/downloads/${PKGNAME}_$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/cmake:build dev/nasm:build"
+PKGDEPENDS="cmake:build nasm:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/network/curl/curl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/curl/curl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -36,7 +36,7 @@
 : ${SSL:=yes}
 
 if [ "$IDN2" = "yes" ]; then
-	PKGDEPENDS="dns/libidn2 $PKGDEPENDS"
+	PKGDEPENDS="libidn2 $PKGDEPENDS"
 	with_idn2="--with-libidn2"
 else
 	with_idn2="--without-libidn2"
@@ -49,21 +49,21 @@
 fi
 
 if [ "$NGHTTP2" = "yes" ]; then
-	PKGDEPENDS="network/nghttp2 $PKGDEPENDS"
+	PKGDEPENDS="nghttp2 $PKGDEPENDS"
 	with_nghttp2="--with-nghttp2"
 else
 	with_nghttp2="--without-nghttp2"
 fi
 
 if [ "$SSH" = "yes" ]; then
-	PKGDEPENDS="network/libssh2 $PKGDEPENDS"
+	PKGDEPENDS="libssh2 $PKGDEPENDS"
 	with_ssh="--with-libssh2"
 else
 	with_ssh="--without-libssh2"
 fi
 
 if [ "$SSL" = "yes" ]; then
-	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
+	PKGDEPENDS="libressl $PKGDEPENDS"
 	with_ssl="--with-ssl"
 else
 	with_ssl="--without-ssl"
--- a/network/inetutils/inetutils.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/inetutils/inetutils.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${PAM:=yes}
 
 if [ "$PAM" = "yes" ]; then
-	PKGDEPENDS="security/linux-pam $PKGDEPENDS"
+	PKGDEPENDS="linux-pam $PKGDEPENDS"
 	with_pam="--with-pam"
 else
 	with_pam="--without-pam"
--- a/network/ipcalc/ipcalc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/ipcalc/ipcalc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="network IP calculator"
 PKGDOWNLOAD="http://jodies.de/ipcalc-archive/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="perl/perl"
+PKGDEPENDS="perl"
 
 build()
 {
--- a/network/iproute2/iproute2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/iproute2/iproute2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPL2"
 PKGSUMMARY="IP routing utilities"
 PKGDOWNLOAD="https://www.kernel.org/pub/linux/utils/net/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="core/elfutils"
+PKGDEPENDS="elfutils"
 PKGOPTIONS="CAP MNL"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -34,13 +34,13 @@
 : ${MNL:=yes}
 
 if [ "$CAP" = "yes" ]; then
-	PKGDEPENDS="core/libcap $PKGDEPENDS"
+	PKGDEPENDS="libcap $PKGDEPENDS"
 	CFLAGS="-DHAVE_LIBCAP $CFLAGS"
 	LIBS="-lcap $LIBS"
 fi
 
 if [ "$MNL" = "yes" ]; then
-	PKGDEPENDS="lib/libmnl $PKGDEPENDS"
+	PKGDEPENDS="libmnl $PKGDEPENDS"
 	CFLAGS="-DHAVE_LIBMNL $CFLAGS"
 	LIBS="-lmnl $LIBS"
 fi
--- a/network/iputils/iputils.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/iputils/iputils.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE GPLv2+"
 PKGSUMMARY="IP configuration utilities"
 PKGDOWNLOAD="https://github.com/iputils/$PKGNAME/archive/s$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/linux-headers crypto/libressl"
+PKGDEPENDS="linux-headers libressl"
 PKGOPTIONS="CAP"
 
 : ${CC:=clang}
@@ -32,7 +32,7 @@
 : ${NETTLE:=yes}
 
 if [ "$CAP" = "yes" ]; then
-	PKGDEPENDS="core/libcap $PKGDEPENDS"
+	PKGDEPENDS="libcap $PKGDEPENDS"
 	mflags="USE_CAP=yes $mflags"
 else
 	mflags="USE_CAP=no $mflags"
--- a/network/libpsl/libpsl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/libpsl/libpsl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT"
 PKGSUMMARY="C library for the Public Suffix List"
 PKGDOWNLOAD="https://github.com/rockdaboot/libpsl/releases/download/$PKGNAME-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="dns/libidn2"
+PKGDEPENDS="libidn2"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/network/libsoup/libsoup.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/libsoup/libsoup.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="HTTP client library from GNOME"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/2.66/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build dev/gobject-introspection"
+PKGDEPENDS="meson:build gobject-introspection"
 PKGOPTIONS="GNOME KERBEROS VALA"
 
 : ${CC:=clang}
@@ -45,7 +45,7 @@
 fi
 
 if [ "$VALA" = "yes" ]; then
-	PKGDEPENDS="lang/vala $PKGDEPENDS"
+	PKGDEPENDS="vala $PKGDEPENDS"
 	with_vala="-D vapi=true"
 else
 	with_vala="-D vapi=false"
--- a/network/libssh/libssh.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/libssh/libssh.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="C library that implements SSHv2 protocol"
 PKGDOWNLOAD="https://www.libssh.org/files/0.9/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/cmake:build compression/zlib"
+PKGDEPENDS="cmake:build zlib"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/network/libssh2/libssh2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/libssh2/libssh2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="C library that implements SSHv2 protocol"
 PKGDOWNLOAD="https://www.libssh2.org/download/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/cmake:build compression/zlib crypto/libressl"
+PKGDEPENDS="cmake:build zlib libressl"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/network/nghttp2/nghttp2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/nghttp2/nghttp2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -35,12 +35,12 @@
 : ${TOOLS:=yes}
 
 if [ "$TOOLS" = "yes" ]; then
-	PKGDEPENDS="lib/libev
-	            lib/jansson
-	            crypto/libressl
-	            compression/zlib
-	            dns/c-ares
-	            text/libxml2 $PKGDEPENDS"
+	PKGDEPENDS="libev
+	            jansson
+	            libressl
+	            zlib
+	            c-ares
+	            libxml2 $PKGDEPENDS"
 	with_tools="--enable-app"
 else
 	with_tools="--disable-app"
--- a/network/ntp/ntp.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/ntp/ntp.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="network time protocol"
 PKGDOWNLOAD="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="crypto/libressl"
+PKGDEPENDS="libressl"
 PKGOPTIONS="CAP IPV6 NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -35,7 +35,7 @@
 : ${NLS:=yes}
 
 if [ "$CAP" = "yes" ]; then
-	PKGDEPENDS="core/libcap $PKGDEPENDS"
+	PKGDEPENDS="libcap $PKGDEPENDS"
 	with_cap="--enable-linuxcaps"
 else
 	with_cap="--disable-linuxcaps"
@@ -48,7 +48,7 @@
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/network/openssh/openssh.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/openssh/openssh.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -36,7 +36,7 @@
 : ${SELINUX:=no}
 
 if [ "$PAM" = "yes" ]; then
-	PKGDEPENDS="security/linux-pam $PKGDEPENDS"
+	PKGDEPENDS="linux-pam $PKGDEPENDS"
 	with_pam="--with-pam"
 else
 	with_pam="--without-pam"
--- a/network/sdl2-net/sdl2-net.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/sdl2-net/sdl2-net.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="zlib"
 PKGSUMMARY="network addon for SDL2"
 PKGDOWNLOAD="https://www.libsdl.org/projects/SDL_net/release/SDL2_net-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/sdl2"
+PKGDEPENDS="sdl2"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/network/uriparser/uriparser.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/uriparser/uriparser.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="RFC 3986 compliant URI parsing library"
 PKGDOWNLOAD="https://github.com/uriparser/uriparser/releases/download/$PKGNAME-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/cmake:build"
+PKGDEPENDS="cmake:build"
 PKGOPTIONS="DOXYGEN"
 
 : ${CC:=clang}
--- a/network/wget/wget.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/wget/wget.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3"
 PKGSUMMARY="GNU network utility to retrieve files from the web"
 PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.lz"
-PKGDEPENDS="lib/libunistring compression/zlib"
+PKGDEPENDS="libunistring zlib"
 PKGOPTIONS="NLS SSL UUID"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -35,24 +35,24 @@
 : ${UUID:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
 fi
 
 if [ "$SSL" = "openssl" ]; then
-	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
+	PKGDEPENDS="libressl $PKGDEPENDS"
 	with_ssl="--with-ssl=openssl"
 elif [ "$SSL" = "gnutls" ]; then
-	PKGDEPENDS="crypto/gnutls $PKGDEPENDS"
+	PKGDEPENDS="gnutls $PKGDEPENDS"
 	with_ssl="--with-ssl=gnutls"
 else
 	with_ssl="--without-ssl"
 fi
 
 if [ "$UUID" = "yes" ]; then
-	PKGDEPENDS="core/util-linux $PKGDEPENDS"
+	PKGDEPENDS="util-linux $PKGDEPENDS"
 	with_uuid="--with-uuid"
 else
 	with_uuid="--without-uuid"
--- a/network/wireless-tools/wireless-tools.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/wireless-tools/wireless-tools.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="wireless tools for Linux"
 PKGDOWNLOAD="https://hewlettpackard.github.io/wireless-tools/wireless_tools.29.tar.gz"
-PKGDEPENDS="lib/linux-headers"
+PKGDEPENDS="linux-headers"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/network/wpa-supplicant/wpa-supplicant.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/network/wpa-supplicant/wpa-supplicant.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="a utility providing key negotiation for WPA wireless networks"
 PKGDOWNLOAD="https://w1.fi/releases/wpa_supplicant-$PKGVERSION.tar.gz"
-PKGDEPENDS="dev/bison:build lib/libnl"
+PKGDEPENDS="bison:build libnl"
 PKGOPTIONS="DBUS SSL"
 
 # TODO: honor CFLAGS
@@ -30,13 +30,13 @@
 : ${SSL:=openssl}
 
 if [ "$DBUS" = "yes" ]; then
-	PKGDEPENDS="$PKGDEPENDS network/dbus"
+	PKGDEPENDS="$PKGDEPENDS dbus"
 fi
 
 if [ "$SSL" = "openssl" ]; then
-	PKGDEPENDS="$PKGDEPENDS crypto/libressl"
+	PKGDEPENDS="$PKGDEPENDS libressl"
 elif [ "$SSL" = "gnutls" ]; then
-	PKGDEPENDS="$PKGDEPENDS crypto/gnutls"
+	PKGDEPENDS="$PKGDEPENDS gnutls"
 else
 	with_crypto="no"
 fi
--- a/perl/p5-locale-gettext/p5-locale-gettext.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/perl/p5-locale-gettext/p5-locale-gettext.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv1 ART10"
 PKGSUMMARY="gettext localization functions for Perl"
 PKGDOWNLOAD="http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/Locale-gettext-$PKGVERSION.tar.gz"
-PKGDEPENDS="perl/perl core/gettext"
+PKGDEPENDS="perl gettext"
 
 : ${CC:=clang}
 : ${CFLAGS:=}
--- a/perl/p5-uri/p5-uri.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/perl/p5-uri/p5-uri.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv1+ ART10"
 PKGSUMMARY="URI parser for Perl"
 PKGDOWNLOAD="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/URI-$PKGVERSION.tar.gz"
-PKGDEPENDS="perl/perl"
+PKGDEPENDS="perl"
 
 build()
 {
--- a/perl/p5-xml-namespacesupport/p5-xml-namespacesupport.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/perl/p5-xml-namespacesupport/p5-xml-namespacesupport.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv1+ ART10"
 PKGSUMMARY="XML namespaces support for perl"
 PKGDOWNLOAD="https://www.cpan.org/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-$PKGVERSION.tar.gz"
-PKGDEPENDS="perl/perl"
+PKGDEPENDS="perl"
 
 build()
 {
--- a/perl/p5-xml-parser/p5-xml-parser.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/perl/p5-xml-parser/p5-xml-parser.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv1+ ART10"
 PKGSUMMARY="XML parser module for perl using expat"
 PKGDOWNLOAD="http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/expat perl/perl"
+PKGDEPENDS="expat perl"
 
 : ${CC:=clang}
 
--- a/perl/p5-xml-sax-base/p5-xml-sax-base.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/perl/p5-xml-sax-base/p5-xml-sax-base.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv1+ ART10"
 PKGSUMMARY="base module for XML drivers"
 PKGDOWNLOAD="https://www.cpan.org/authors/id/G/GR/GRANTM/XML-SAX-Base-$PKGVERSION.tar.gz"
-PKGDEPENDS="perl/perl"
+PKGDEPENDS="perl"
 
 build()
 {
--- a/perl/p5-xml-sax-expat/p5-xml-sax-expat.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/perl/p5-xml-sax-expat/p5-xml-sax-expat.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,11 +21,11 @@
 PKGLICENSE="GPLv1+ ART10"
 PKGSUMMARY="expat implementation for XML::SAX"
 PKGDOWNLOAD="https://www.cpan.org/authors/id/B/BJ/BJOERN/XML-SAX-Expat-$PKGVERSION.tar.gz"
-PKGDEPENDS="perl/perl
-            perl/p5-xml-namespacesupport
-            perl/p5-xml-parser
-            perl/p5-xml-sax
-            perl/p5-xml-sax-base"
+PKGDEPENDS="perl
+            p5-xml-namespacesupport
+            p5-xml-parser
+            p5-xml-sax
+            p5-xml-sax-base"
 
 build()
 {
--- a/perl/p5-xml-sax/p5-xml-sax.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/perl/p5-xml-sax/p5-xml-sax.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="XML API for perl"
 PKGSUMMARY="GPLv1+ ART10"
 PKGDOWNLOAD="https://www.cpan.org/authors/id/G/GR/GRANTM/XML-SAX-$PKGVERSION.tar.gz"
-PKGDEPENDS="perl/perl perl/p5-xml-sax-base perl/p5-xml-namespacesupport"
+PKGDEPENDS="perl p5-xml-sax-base p5-xml-namespacesupport"
 
 build()
 {
@@ -32,7 +32,7 @@
 	patch -p0 < ../patch-disable-install.patch
 	perl Makefile.PL INSTALLDIRS=vendor
 	PERLLIB=blib/lib make DESTDIR=$DESTDIR install
-	rm -f $DESTDIR/lib/perl5/core_perl/perllocal.pod
+	rm -f $DESTDIR/lib/perl5/core_perllocal.pod
 	rm -f $DESTDIR/lib/perl5/vendor_perl/auto/XML/SAX/.packlist
 
 	cd ..
--- a/perl/p5-xml-simple/p5-xml-simple.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/perl/p5-xml-simple/p5-xml-simple.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv1+ ART10"
 PKGSUMMARY="short summary"
 PKGDOWNLOAD="ftp://ftp.cpan.org/pub/CPAN/authors/id/G/GR/GRANTM/XML-Simple-$PKGVERSION.tar.gz"
-PKGDEPENDS="perl/perl perl/p5-xml-sax-expat"
+PKGDEPENDS="perl p5-xml-sax-expat"
 
 build()
 {
--- a/perl/perl/perl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/perl/perl/perl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv1 CUSTOM"
 PKGSUMMARY="perl programming language"
 PKGDOWNLOAD="https://www.cpan.org/src/5.0/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="compression/zlib compression/bzip2"
+PKGDEPENDS="zlib bzip2"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/print/cups/cups.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/print/cups/cups.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -49,14 +49,14 @@
 fi
 
 if [ "$DBUS" = "yes" ]; then
-	PKGDEPENDS="network/dbus $PKGDEPENDS"
+	PKGDEPENDS="dbus $PKGDEPENDS"
 	with_dbus="--enable-dbus"
 else
 	with_dbus="--disable-bus"
 fi
 
 if [ "$PAM" = "yes" ]; then
-	PKGDEPENDS="security/linux-pam $PKGDEPENDS"
+	PKGDEPENDS="linux-pam $PKGDEPENDS"
 	with_pam="--enable-pam"
 else
 	with_pam="--disable-pam"
--- a/python/py-ansicolor/py-ansicolor.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/py-ansicolor/py-ansicolor.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -22,7 +22,7 @@
 PKGLICENSE="APACHE20"
 PKGSUMMARY="Library to produce ansi color output and colored highlighting and diffing"
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/source/a/ansicolor/ansicolor-$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python"
+PKGDEPENDS="python"
 
 build()
 {
--- a/python/py-commonmark/py-commonmark.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/py-commonmark/py-commonmark.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -22,7 +22,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="Python parser for the CommonMark Markdown spec"
 PKGDOWNLOAD="https://github.com/rtfd/CommonMark-py/archive/$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python"
+PKGDEPENDS="python"
 
 build()
 {
--- a/python/py-daemon/py-daemon.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/py-daemon/py-daemon.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -22,7 +22,7 @@
 PKGLICENSE="APACHE20"
 PKGSUMMARY="Library to implement a well-behaved Unix daemon process"
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/99/2a/75fe6aa7086e838570f29899f674e7896a42be26d9fff33f90d990e599d2/python-daemon-$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python"
+PKGDEPENDS="python"
 
 build()
 {
--- a/python/py-dateutil/py-dateutil.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/py-dateutil/py-dateutil.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -22,7 +22,7 @@
 PKGLICENSE="BSD3CLAUSE APACHE20"
 PKGSUMMARY="Provides powerful extensions to the standard datetime module"
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/source/p/python-dateutil/python-dateutil-$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python"
+PKGDEPENDS="python"
 
 build()
 {
--- a/python/py-docker/py-docker.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/py-docker/py-docker.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -22,7 +22,7 @@
 PKGLICENSE="APACHE20"
 PKGSUMMARY="A Python library for the Docker Engine API"
 PKGDOWNLOAD="https://github.com/docker/docker-py/archive/$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python"
+PKGDEPENDS="python"
 
 build()
 {
--- a/python/py-docutils/py-docutils.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/py-docutils/py-docutils.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -22,7 +22,7 @@
 PKGLICENSE="BSD2CLAUSE GPLv3"
 PKGSUMMARY="Set of tools for processing plaintext docs into formats such as HTML, XML, or LaTeX"
 PKGDOWNLOAD="http://downloads.sourceforge.net/docutils/docutils-$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python python/python2"
+PKGDEPENDS="python python2"
 
 build()
 {
--- a/python/py-editorconfig/py-editorconfig.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/py-editorconfig/py-editorconfig.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -22,7 +22,7 @@
 PKGLICENSE="BSD PSF"
 PKGSUMMARY="EditorConfig File Locator and Interpreter for Python"
 PKGDOWNLOAD="https://pypi.io/packages/source/E/EditorConfig/EditorConfig-$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python"
+PKGDEPENDS="python"
 
 build()
 {
--- a/python/py-isodate/py-isodate.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/py-isodate/py-isodate.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -22,7 +22,7 @@
 PKGLICENSE="BSD"
 PKGSUMMARY="An ISO 8601 date/time/duration parser and formatter"
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/source/i/isodate/isodate-$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python"
+PKGDEPENDS="python"
 
 build()
 {
--- a/python/py-mako/py-mako.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/py-mako/py-mako.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT"
 PKGSUMMARY="templating language for Python"
 PKGDOWNLOAD="https://files.pythonhosted.org/packages/eb/69/6137c60cae2ab8c911bff510bb6d1d23a0189f75d114bb277606c6486b5f/Mako-1.0.8.tar.gz"
-PKGDEPENDS="python/python python/py-setuptools"
+PKGDEPENDS="python py-setuptools"
 
 build()
 {
--- a/python/py-pygments/py-pygments.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/py-pygments/py-pygments.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD2CLAUSE"
 PKGSUMMARY="python syntax highlighter"
 PKGDOWNLOAD="https://pypi.org/packages/source/P/Pygments/Pygments-$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python"
+PKGDEPENDS="python"
 
 build()
 {
--- a/python/py-setuptools/py-setuptools.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/py-setuptools/py-setuptools.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="PSF"
 PKGSUMMARY="enhancements to the Python distutils"
 PKGDOWNLOAD="https://github.com/pypa/setuptools/archive/v$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python python/python2"
+PKGDEPENDS="python python2"
 
 build()
 {
--- a/python/python/python.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/python/python.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="PSF"
 PKGSUMMARY="high-level scripting language"
 PKGDOWNLOAD="https://www.python.org/ftp/python/$PKGVERSION/Python-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/libffi lib/expat compression/zlib crypto/libressl"
+PKGDEPENDS="libffi expat zlib libressl"
 PKGOPTIONS="IPV6"
 
 : ${CHOST:=$(uname -m)-linux-musl}
--- a/python/python2/python2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/python/python2/python2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="PSF"
 PKGSUMMARY="high-level scripting language"
 PKGDOWNLOAD="https://www.python.org/ftp/python/$PKGVERSION/Python-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/libffi lib/expat compression/zlib crypto/libressl"
+PKGDEPENDS="libffi expat zlib libressl"
 PKGOPTIONS="IPV6"
 
 : ${CHOST:=$(uname -m)-linux-musl}
--- a/qt/qt3d/qt3d.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qt3d/qt3d.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt 3d module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtbase/qtbase.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtbase/qtbase.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -16,7 +16,7 @@
 #
 
 # TODO: add option for PostgreSQL and mariadb.
-# TODO: add optional dependencies for Qt modules (e.g. qt/qtwayland)
+# TODO: add optional dependencies for Qt modules (e.g. qtwayland)
 
 PKGNAME=qtbase
 PKGVERSION=5.13.0
@@ -24,7 +24,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="cross platform SDK for developing applications"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/pcre2"
+PKGDEPENDS="pcre2"
 PKGOPTIONS="CUPS
             DATABASES
             DBUS
@@ -80,7 +80,7 @@
 fi
 
 if [ "$CUPS" = "yes" ]; then
-	PKGDEPENDS="print/cups $PKGDEPENDS"
+	PKGDEPENDS="cups $PKGDEPENDS"
 	with_cups="-cups"
 else
 	with_cups="-no-cups"
@@ -101,14 +101,14 @@
                 -no-sql-tds"
 
 if echo $DATABASES | grep -q "sqlite"; then
-	PKGDEPENDS="databases/sqlite $PKGDEPENDS"
+	PKGDEPENDS="sqlite $PKGDEPENDS"
 	with_databases="-sql-sqlite -system-sqlite $with_databases"
 else
 	with_databases="-no-sql-sqlite $with_databases"
 fi
 
 if [ "$DBUS" = "yes" ]; then
-	PKGDEPENDS="network/dbus $PKGDEPENDS"
+	PKGDEPENDS="dbus $PKGDEPENDS"
 	with_dbus="-dbus-linked"
 else
 	with_dbus="-no-dbus"
@@ -121,28 +121,28 @@
 fi
 
 if [ "$FONTCONFIG" = "yes" ]; then
-	PKGDEPENDS="fonts/fontconfig $PKGDEPENDS"
+	PKGDEPENDS="fontconfig $PKGDEPENDS"
 	with_fontconfig="-fontconfig"
 else
 	with_fontconfig="-no-fontconfig"
 fi
 
 if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="fonts/freetype $PKGDEPENDS"
+	PKGDEPENDS="freetype $PKGDEPENDS"
 	with_freetype="-system-freetype"
 else
 	with_freetype="-no-freetype"
 fi
 
 if [ "$GLIB" = "yes" ]; then
-	PKGDEPENDS="lib/glib $PKGDEPENDS"
+	PKGDEPENDS="glib $PKGDEPENDS"
 	with_glib="-glib"
 else
 	with_glib="-no-glib"
 fi
 
 if [ "$GTK" = "yes" ]; then
-	PKGDEPENDS="graphics/gtk $PKGDEPENDS"
+	PKGDEPENDS="gtk $PKGDEPENDS"
 	with_gtk="-gtk"
 else
 	with_gtk="-no-gtk"
@@ -159,35 +159,35 @@
 fi
 
 if [ "$HARFBUZZ" = "yes" ]; then
-	PKGDEPENDS="fonts/harfbuzz $PKGDEPENDS"
+	PKGDEPENDS="harfbuzz $PKGDEPENDS"
 	with_harfbuzz="-system-harfbuzz"
 else
 	with_harfbuzz="-no-harfbuzz"
 fi
 
 if [ "$ICU" = "yes" ]; then
-	PKGDEPENDS="lib/icu $PKGDEPENDS"
+	PKGDEPENDS="icu $PKGDEPENDS"
 	with_icu="-icu"
 else
 	with_icu="-no-icu"
 fi
 
 if [ "$KMS" = "yes" ]; then
-	PKGDEPENDS="graphics/libdrm $PKGDEPENDS"
+	PKGDEPENDS="libdrm $PKGDEPENDS"
 	with_kms="-kms"
 else
 	with_kms="-no-kms"
 fi
 
 if [ "$LIBINPUT" = "yes" ]; then
-	PKGDEPENDS="lib/libinput $PKGDEPENDS"
+	PKGDEPENDS="libinput $PKGDEPENDS"
 	with_libinput="-libinput"
 else
 	with_libinput="-no-libinput"
 fi
 
 if [ "$MTDEV" = "yes" ]; then
-	PKGDEPENDS="lib/mtdev $PKGDEPENDS"
+	PKGDEPENDS="mtdev $PKGDEPENDS"
 	with_mtdev="-mtdev"
 else
 	with_mtdev="-no-mtdev"
@@ -214,7 +214,7 @@
 fi
 
 if [ "$SSL" = "yes" ]; then
-	PKGDEPENDS="crypto/libressl $PKGDEPENDS"
+	PKGDEPENDS="libressl $PKGDEPENDS"
 	with_ssl="-ssl -openssl-linked"
 else
 	with_ssl="-no-openssl"
@@ -227,7 +227,7 @@
 fi
 
 if [ "$UDEV" = "yes" ]; then
-	PKGDEPENDS="core/eudev $PKGDEPENDS"
+	PKGDEPENDS="eudev $PKGDEPENDS"
 	with_udev="-libudev"
 else
 	with_udev="-no-libudev"
@@ -240,7 +240,7 @@
 fi
 
 if [ "$ZLIB" = "yes" ]; then
-	PKGDEPENDS="compression/zlib $PKGDEPENDS"
+	PKGDEPENDS="zlib $PKGDEPENDS"
 	with_zlib="-system-zlib"
 else
 	with_zlib="-no-zlib"
--- a/qt/qtconnectivity/qtconnectivity.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtconnectivity/qtconnectivity.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt connectivity module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtdeclarative/qtdeclarative.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtdeclarative/qtdeclarative.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt declarative module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtgamepad/qtgamepad.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtgamepad/qtgamepad.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt gamepad module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtlocation/qtlocation.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtlocation/qtlocation.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt location module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtmultimedia/qtmultimedia.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtmultimedia/qtmultimedia.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -24,7 +24,7 @@
 PKGSUMMARY="Qt multimedia module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
 PKGOPTIONS="ALSA PULSEAUDIO"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
@@ -34,14 +34,14 @@
 : ${PULSEAUDIO:=yes}
 
 if [ "$ALSA" = "yes" ]; then
-	PKGDEPENDS="audio/alsa-lib $PKGDEPENDS"
+	PKGDEPENDS="alsa-lib $PKGDEPENDS"
 	with_alsa="-alsa"
 else
 	with_alsa="-no-alsa"
 fi
 
 if [ "$PULSEAUDIO" = "yes" ]; then
-	PKGDEPENDS="audio/pulseaudio $PKGDEPENDS"
+	PKGDEPENDS="pulseaudio $PKGDEPENDS"
 	with_pulseaudio="-pulseaudio"
 else
 	with_pulseaudio="-no-pulseaudio"
--- a/qt/qtnetworkauth/qtnetworkauth.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtnetworkauth/qtnetworkauth.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt networkauth module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtquickcontrols/qtquickcontrols.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtquickcontrols/qtquickcontrols.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt quickcontrols module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtquickcontrols2/qtquickcontrols2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtquickcontrols2/qtquickcontrols2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt quickcontrols2 module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtremoteobjects/qtremoteobjects.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtremoteobjects/qtremoteobjects.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt remoteobjects module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtscript/qtscript.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtscript/qtscript.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt script module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtsensors/qtsensors.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtsensors/qtsensors.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt sensors module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtspeech/qtspeech.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtspeech/qtspeech.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt speech module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qttools/qttools.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qttools/qttools.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt tools module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtwayland/qtwayland.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtwayland/qtwayland.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt wayland module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="graphics/wayland qt/qtbase"
+PKGDEPENDS="wayland qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtwebchannel/qtwebchannel.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtwebchannel/qtwebchannel.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt webchannel module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtwebsockets/qtwebsockets.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtwebsockets/qtwebsockets.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt websockets module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtwebview/qtwebview.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtwebview/qtwebview.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt webview module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/qt/qtxmlpatterns/qtxmlpatterns.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtxmlpatterns/qtxmlpatterns.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3 LGPLv21"
 PKGSUMMARY="Qt xmlpatterns module"
 PKGDOWNLOAD="http://download.qt-project.org/official_releases/qt/${PKGVERSION%.*}/$PKGVERSION/submodules/$PKGNAME-everywhere-src-$PKGVERSION.tar.xz"
-PKGDEPENDS="qt/qtbase"
+PKGDEPENDS="qtbase"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/ruby/ruby/ruby.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/ruby/ruby/ruby.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD2CLAUSE"
 PKGSUMMARY="object oriented language"
 PKGDOWNLOAD="https://cache.ruby-lang.org/pub/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="compression/zlib crypto/libressl lib/gmp lib/libffi"
+PKGDEPENDS="zlib libressl gmp libffi"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/security/libsecret/libsecret.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/security/libsecret/libsecret.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="a library for storing and accessing passwords"
 PKGDOWNLOAD="https://download.gnome.org/sources/libsecret/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib text/libxslt:build"
+PKGDEPENDS="glib libxslt:build"
 PKGOPTIONS="CRYPTO NLS VALA"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -36,21 +36,21 @@
 : ${VALA:=yes}
 
 if [ "$CRYPTO" = "yes" ]; then
-	PKGDEPENDS="crypto/libgcrypt $PKGDEPENDS"
+	PKGDEPENDS="libgcrypt $PKGDEPENDS"
 	with_crypto="--enable-gcrypt"
 else
 	with_crypto="--disable-gcrypt"
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
 fi
 
 if [ "$VALA" = "yes" ]; then
-	PKGDEPENDS="lang/vala $PKGDEPENDS"
+	PKGDEPENDS="vala $PKGDEPENDS"
 	with_vala="--enable-vala"
 else
 	with_vala="--disable-vala"
--- a/security/linux-pam/linux-pam.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/security/linux-pam/linux-pam.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -46,7 +46,7 @@
 : ${SELINUX:=no}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/security/polkit/polkit.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/security/polkit/polkit.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="toolkit for handling authorizations"
 PKGSUMMARY="short summary"
 PKGDOWNLOAD="https://www.freedesktop.org/software/$PKGNAME/releases/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="lib/expat"
+PKGDEPENDS="expat"
 PKGOPTIONS="PAM"
 PKGUIDS="polkitd:101"
 PKGGIDS="polkitd:101"
@@ -35,10 +35,10 @@
 : ${PAM:=yes}
 
 if [ "$PAM" = "yes" ]; then
-	PKGDEPENDS="security/linux-pam $PKGDEPENDS"
+	PKGDEPENDS="linux-pam $PKGDEPENDS"
 	with_pam="--with-authfw=pam"
 else
-	PKGDEPENDS="security/shadow $PKGDEPENDS"
+	PKGDEPENDS="shadow $PKGDEPENDS"
 	with_pam="--with-authfw=shadow"
 fi
 
--- a/security/shadow/shadow.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/security/shadow/shadow.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -53,21 +53,21 @@
 : ${SELINUX:=no}
 
 if [ "$ACL" = "yes" ]; then
-	PKGDEPENDS="core/acl $PKGDEPENDS"
+	PKGDEPENDS="acl $PKGDEPENDS"
 	with_acl="--with-acl"
 else
 	with_acl="--without-acl"
 fi
 
 if [ "$ATTR" = "yes" ]; then
-	PKGDEPENDS="core/acl $PKGDEPENDS"
+	PKGDEPENDS="acl $PKGDEPENDS"
 	with_attr="--with-attr"
 else
 	with_attr="--without-attr"
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/shells/bash/bash.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/shells/bash/bash.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/shells/dash/dash.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/shells/dash/dash.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -32,7 +32,7 @@
 : ${LIBEDIT:=no}
 
 if [ "$LIBEDIT" = "yes" ]; then
-	PKGDEPENDS="lib/libedit $PKGDEPENDS"
+	PKGDEPENDS="libedit $PKGDEPENDS"
 	with_libedit="--with-libedit"
 else
 	with_libedit="--without-libedit"
--- a/shells/zsh/zsh.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/shells/zsh/zsh.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD"
 PKGSUMMARY="advanced command interpreter"
 PKGDOWNLOAD="https://www.zsh.org/pub/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/ncurses"
+PKGDEPENDS="ncurses"
 PKGOPTIONS="CAP GDBM PCRE"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -37,21 +37,21 @@
 : ${PCRE:=no}
 
 if [ "$CAP" = "yes" ]; then
-	PKGDEPENDS="core/libcap $PKGDEPENDS"
+	PKGDEPENDS="libcap $PKGDEPENDS"
 	with_cap="--enable-cap"
 else
 	with_cap="--disable-cap"
 fi
 
 if [ "$GDBM" = "yes" ]; then
-	PKGDEPENDS="databases/gdbm $PKGDEPENDS"
+	PKGDEPENDS="gdbm $PKGDEPENDS"
 	with_gdbm="--enable-gdbm"
 else
 	with_gdbm="--disable-gdbm"
 fi
 
 if [ "$PCRE" = "yes" ]; then
-	PKGDEPENDS="lib/pcre $PKGDEPENDS"
+	PKGDEPENDS="pcre $PKGDEPENDS"
 	with_pcre="--enable-pcre"
 else
 	with_pcre="--disable-pcre"
--- a/system/accountsservice/accountsservice.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/system/accountsservice/accountsservice.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3"
 PKGSUMMARY="D-Bus API for querying users"
 PKGDOWNLOAD="https://www.freedesktop.org/software/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build dev/gobject-introspection security/polkit"
+PKGDEPENDS="meson:build gobject-introspection polkit"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/system/rsync/rsync.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/system/rsync/rsync.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3"
 PKGSUMMARY="versatile copy tool"
 PKGDOWNLOAD="https://download.samba.org/pub/$PKGNAME/src/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="core/acl core/attr lib/popt compression/zlib"
+PKGDEPENDS="acl attr popt zlib"
 PKGOPTIONS="IPV6"
 PKGPROTECT="/etc/rsyncd.conf"
 
--- a/system/upower/upower.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/system/upower/upower.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -23,7 +23,7 @@
 PKGLICENSE="GPLv20+"
 PKGSUMMARY="abstraction for enumerating power devices"
 PKGDOWNLOAD="https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib lib/libgudev lib/libusb text/libxslt:build"
+PKGDEPENDS="glib libgudev libusb libxslt:build"
 PKGOPTIONS="NLS"
 PKGPROTECT="etc/UPower/UPower.conf"
 
@@ -38,7 +38,7 @@
 : ${NLS:=yes}
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/terminals/xterm/xterm.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/terminals/xterm/xterm.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="X terminal emulator"
 PKGSUMMARY="CUSTOM"
 PKGDOWNLOAD="ftp://ftp.invisible-island.net/pub/$PKGNAME/$PKGNAME-$PKGVERSION.tgz"
-PKGDEPENDS="x11/luit"
+PKGDEPENDS="luit"
 PKGOPTIONS="FREETYPE"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${FREETYPE:=yes}
 
 if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="fonts/freetype $PKGDEPENDS"
+	PKGDEPENDS="freetype $PKGDEPENDS"
 	with_freetype="--enable-freetype"
 else
 	with_freetype="--disable-freetype"
--- a/text/aspell-af/aspell-af.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-af/aspell-af.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="Afrikaans dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/af/aspell-af-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-am/aspell-am.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-am/aspell-am.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="PUBLICDOMAIN"
 PKGSUMMARY="Amharic dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/am/aspell6-am-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ar/aspell-ar.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ar/aspell-ar.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Arabic dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ar/aspell6-ar-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ast/aspell-ast.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ast/aspell-ast.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Asturian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ast/aspell6-ast-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-az/aspell-az.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-az/aspell-az.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Azerbaijani dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/az/aspell6-az-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-be/aspell-be.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-be/aspell-be.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Belarusian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/be/aspell5-be-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-bg/aspell-bg.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-bg/aspell-bg.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Bulgarian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/bg/aspell6-bg-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-bn/aspell-bn.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-bn/aspell-bn.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Bengali dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/bn/aspell6-bn-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-br/aspell-br.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-br/aspell-br.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Breton dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/br/aspell-br-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ca/aspell-ca.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ca/aspell-ca.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Catalan dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ca/aspell6-ca-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-cs/aspell-cs.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-cs/aspell-cs.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Czech dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/cs/aspell6-cs-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-csb/aspell-csb.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-csb/aspell-csb.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Kashubian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/csb/aspell6-csb-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-cy/aspell-cy.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-cy/aspell-cy.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Welsh dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/cy/aspell-cy-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-da/aspell-da.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-da/aspell-da.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Danish dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/da/aspell6-da-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-de/aspell-de.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-de/aspell-de.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+ BSD4CLAUSE"
 PKGSUMMARY="German dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/de/aspell6-de-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-el/aspell-el.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-el/aspell-el.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Greek dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/el/aspell6-el-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-en/aspell-en.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-en/aspell-en.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="English dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-eo/aspell-eo.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-eo/aspell-eo.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Esperanto dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/eo/aspell6-eo-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-es/aspell-es.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-es/aspell-es.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Spanish dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/es/aspell6-es-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-et/aspell-et.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-et/aspell-et.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21+"
 PKGSUMMARY="Estonian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/et/aspell6-et-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-fa/aspell-fa.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-fa/aspell-fa.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Persian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/fa/aspell6-fa-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-fi/aspell-fi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-fi/aspell-fi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Finnish dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/fi/aspell6-fi-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-fo/aspell-fo.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-fo/aspell-fo.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Faroese dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/fo/aspell-fo-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-fr/aspell-fr.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-fr/aspell-fr.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="French dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/fr/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-fy/aspell-fy.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-fy/aspell-fy.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Frisian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/fy/aspell6-fy-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ga/aspell-ga.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ga/aspell-ga.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Irish dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ga/aspell5-ga-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-gd/aspell-gd.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-gd/aspell-gd.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Scottish dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/gd/aspell5-gd-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-gl/aspell-gl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-gl/aspell-gl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Galician dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/gl/aspell6-gl-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-grc/aspell-grc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-grc/aspell-grc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3+"
 PKGSUMMARY="Ancient Greek dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/grc/aspell6-grc-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-gu/aspell-gu.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-gu/aspell-gu.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Gujarati dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/gu/aspell6-gu-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-gv/aspell-gv.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-gv/aspell-gv.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Manx Gaelic dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/gv/aspell-gv-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-he/aspell-he.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-he/aspell-he.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Hebrew dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/he/aspell6-he-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-hi/aspell-hi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-hi/aspell-hi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Hindi dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hi/aspell6-hi-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-hil/aspell-hil.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-hil/aspell-hil.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Hiligaynon dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hil/aspell5-hil-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-hr/aspell-hr.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-hr/aspell-hr.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="Croatian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hr/aspell-hr-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-hsb/aspell-hsb.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-hsb/aspell-hsb.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Upper Sorbian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hsb/aspell6-hsb-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-hu/aspell-hu.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-hu/aspell-hu.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Hungarian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hu/aspell6-hu-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-hus/aspell-hus.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-hus/aspell-hus.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3+"
 PKGSUMMARY="Huastec dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hus/aspell6-hus-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-hy/aspell-hy.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-hy/aspell-hy.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Armenian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/hy/aspell6-hy-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ia/aspell-ia.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ia/aspell-ia.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="Interligua dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ia/aspell-ia-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-id/aspell-id.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-id/aspell-id.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Indonesian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/id/aspell5-id-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-is/aspell-is.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-is/aspell-is.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Big Icelandic dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/is/aspell-is-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-it/aspell-it.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-it/aspell-it.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Italian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/it/aspell6-it-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-kn/aspell-kn.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-kn/aspell-kn.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Kannada dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/kn/aspell6-kn-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ku/aspell-ku.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ku/aspell-ku.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Kurdish dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ku/aspell5-ku-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ky/aspell-ky.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ky/aspell-ky.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Kirghiz dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ky/aspell6-ky-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-la/aspell-la.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-la/aspell-la.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Latin dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/la/aspell6-la-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-lt/aspell-lt.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-lt/aspell-lt.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD3CLAUSE"
 PKGSUMMARY="Lithuanian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/lt/aspell6-lt-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-lv/aspell-lv.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-lv/aspell-lv.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Latvian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/lv/aspell6-lv-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-mg/aspell-mg.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-mg/aspell-mg.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Malagasy dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/mg/aspell5-mg-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-mi/aspell-mi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-mi/aspell-mi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21+"
 PKGSUMMARY="Maori dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/mi/aspell-mi-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-mk/aspell-mk.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-mk/aspell-mk.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Macedonian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/mk/aspell-mk-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ml/aspell-ml.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ml/aspell-ml.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv3+"
 PKGSUMMARY="Malayalam dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ml/aspell6-ml-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-mn/aspell-mn.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-mn/aspell-mn.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Mongolian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/mn/aspell6-mn-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-mr/aspell-mr.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-mr/aspell-mr.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Marathi dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ms/aspell-ms.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ms/aspell-ms.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GFDLv12"
 PKGSUMMARY="Malay dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ms/aspell-ms-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-mt/aspell-mt.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-mt/aspell-mt.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="Maltese dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/mt/aspell-mt-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-nb/aspell-nb.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-nb/aspell-nb.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Nynorsk Bokmål dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/nb/aspell-nb-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-nds/aspell-nds.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-nds/aspell-nds.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Low Saxon dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/nds/aspell6-nds-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-nl/aspell-nl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-nl/aspell-nl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="Dutch dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/nl/aspell-nl-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-nn/aspell-nn.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-nn/aspell-nn.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Nynorsk Norwegian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/nn/aspell-nn-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ny/aspell-ny.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ny/aspell-ny.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Chichewa dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ny/aspell5-ny-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-or/aspell-or.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-or/aspell-or.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Oriya dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/or/aspell6-or-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-pa/aspell-pa.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-pa/aspell-pa.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Punjabi dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/pa/aspell6-pa-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-pl/aspell-pl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-pl/aspell-pl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2 CC-BY-SAv10 LGPLv21 MPLv11"
 PKGSUMMARY="Polish dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/pl/aspell6-pl-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-pt/aspell-pt.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-pt/aspell-pt.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Brazilian Portuguese dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/pt/aspell-pt-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-qu/aspell-qu.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-qu/aspell-qu.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Quechua dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/qu/aspell6-qu-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ro/aspell-ro.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ro/aspell-ro.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Romanian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ro/aspell5-ro-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ru/aspell-ru.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ru/aspell-ru.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="Russian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ru/aspell6-ru-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-rw/aspell-rw.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-rw/aspell-rw.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Kinyarwanda dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/rw/aspell-rw-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-sc/aspell-sc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-sc/aspell-sc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Sardinian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/sc/aspell5-sc-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-sk/aspell-sk.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-sk/aspell-sk.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2 LGPLv21 MPLv11"
 PKGSUMMARY="Slovak dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/sk/aspell6-sk-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-sl/aspell-sl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-sl/aspell-sl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Slovenian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/sl/aspell-sl-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-sr/aspell-sr.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-sr/aspell-sr.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="Serbian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/sr/aspell6-sr-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-sv/aspell-sv.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-sv/aspell-sv.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="Swedish dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/sv/aspell-sv-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-sw/aspell-sw.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-sw/aspell-sw.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="Swahili dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/sw/aspell-sw-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-ta/aspell-ta.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-ta/aspell-ta.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Tamil dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/ta/aspell6-ta-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-te/aspell-te.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-te/aspell-te.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Telugu dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/te/aspell6-te-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-tet/aspell-tet.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-tet/aspell-tet.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Tetum dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/tet/aspell5-tet-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-tk/aspell-tk.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-tk/aspell-tk.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Turkmen dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/tk/aspell5-tk-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-tl/aspell-tl.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-tl/aspell-tl.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Tagalog dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/tl/aspell5-tl-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-tn/aspell-tn.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-tn/aspell-tn.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Setswana dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/tn/aspell5-tn-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-tr/aspell-tr.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-tr/aspell-tr.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Turkish dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/tr/aspell-tr-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-uk/aspell-uk.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-uk/aspell-uk.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Ukrainian dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/uk/aspell6-uk-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-uz/aspell-uz.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-uz/aspell-uz.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Uzbek dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/uz/aspell6-uz-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-vi/aspell-vi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-vi/aspell-vi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Vietnamese dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/vi/aspell6-vi-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-wa/aspell-wa.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-wa/aspell-wa.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="Walloon dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/wa/aspell-wa-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-yi/aspell-yi.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-yi/aspell-yi.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2+"
 PKGSUMMARY="Yiddish dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/yi/aspell6-yi-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell-zu/aspell-zu.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell-zu/aspell-zu.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="Zulu dictionary for aspell"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/aspell/dict/zu/aspell-zu-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/aspell"
+PKGDEPENDS="aspell"
 
 build()
 {
--- a/text/aspell/aspell.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/aspell/aspell.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="GNU spell checker"
 PKGDOWNLOAD="ftp://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="perl/perl:build"
+PKGDEPENDS="perl:build"
 PKGOPTIONS="NCURSES NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -36,14 +36,14 @@
 : ${NLS:=yes}
 
 if [ "$NCURSES" = "yes" ]; then
-	PKGDEPENDS="lib/ncurses $PKGDEPENDS"
+	PKGDEPENDS="ncurses $PKGDEPENDS"
 	with_ncurses="--enable-curses"
 else
 	with_ncurses="--disable-curses"
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
--- a/text/docbook-xml/docbook-xml.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/docbook-xml/docbook-xml.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -24,7 +24,7 @@
              https://docbook.org/xml/4.3/docbook-xml-4.3.zip
              https://docbook.org/xml/4.4/docbook-xml-4.4.zip
              https://docbook.org/xml/4.5/docbook-xml-4.5.zip"
-PKGDEPENDS="compression/unzip:build text/libxml2:build"
+PKGDEPENDS="unzip:build libxml2:build"
 
 build_version()
 {
--- a/text/hunspell/hunspell.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/hunspell/hunspell.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -37,21 +37,21 @@
 : ${READLINE:=yes}
 
 if [ "$NCURSES" = "yes" ]; then
-	PKGDEPENDS="lib/ncurses $PKGDEPENDS"
+	PKGDEPENDS="ncurses $PKGDEPENDS"
 	with_ncurses="--with-ui"
 else
 	with_ncurses="--without-ui"
 fi
 
 if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="core/gettext $PKGDEPENDS"
+	PKGDEPENDS="gettext $PKGDEPENDS"
 	with_nls="--enable-nls"
 else
 	with_nls="--disable-nls"
 fi
 
 if [ "$READLINE" = "yes" ]; then
-	PKGDEPENDS="lib/readline $PKGDEPENDS"
+	PKGDEPENDS="readline $PKGDEPENDS"
 	with_readline="--with-readline"
 else
 	with_readline="--without-readline"
--- a/text/json-glib/json-glib.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/json-glib/json-glib.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="JSON library based on glib"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="dev/meson:build lib/glib text/libxslt"
+PKGDEPENDS="meson:build glib libxslt"
 PKGOPTIONS="INTROSPECTION"
 
 : ${CC:=clang}
@@ -32,7 +32,7 @@
 : ${INTROSPECTION:=yes}
 
 if [ "$INTROSPECTION" = "yes" ]; then
-	PKGDEPENDS="dev/gobject-introspection:build $PKGDEPENDS"
+	PKGDEPENDS="gobject-introspection:build $PKGDEPENDS"
 	with_introspection="-D introspection=true"
 else
 	with_introspection="-D introspection=true"
--- a/text/libcroco/libcroco.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/libcroco/libcroco.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv20"
 PKGSUMMARY="CSS2 parsing library"
 PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/0.6/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="lib/glib text/libxml2"
+PKGDEPENDS="glib libxml2"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/text/libxml2/libxml2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/libxml2/libxml2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -35,28 +35,28 @@
 : ${ZLIB:=no}
 
 if [ "$ICU" = "yes" ]; then
-	PKGDEPENDS="lib/icu $PKGDEPENDS"
+	PKGDEPENDS="icu $PKGDEPENDS"
 	with_icu="--with-icu"
 else
 	with_icu="--without-icu"
 fi
 
 if [ "$LZMA" = "yes" ]; then
-	PKGDEPENDS="compression/xz $PKGDEPENDS"
+	PKGDEPENDS="xz $PKGDEPENDS"
 	with_lzma="--with-lzma"
 else
 	with_lzma="--without-lzma"
 fi
 
 if [ "$PYTHON" = "yes" ]; then
-	PKGDEPENDS="python/python $PKGDEPENDS"
+	PKGDEPENDS="python $PKGDEPENDS"
 	with_python="--with-python"
 else
 	with_python="--without-python"
 fi
 
 if [ "$ZLIB" = "yes" ]; then
-	PKGDEPENDS="compression/zlib $PKGDEPENDS"
+	PKGDEPENDS="zlib $PKGDEPENDS"
 	with_zlib="--with-zlib"
 else
 	with_zlib="--without-zlib"
--- a/text/libxslt/libxslt.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/libxslt/libxslt.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="XML stylesheet transformation library"
 PKGDOWNLOAD="ftp://xmlsoft.org/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="text/libxml2"
+PKGDEPENDS="libxml2"
 PKGOPTIONS="CRYPTO"
 
 : ${CHOST:=$(uname -m)-linux-musl}
--- a/text/xmlto/xmlto.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/text/xmlto/xmlto.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="GPLv2"
 PKGSUMMARY="frontend for XSL toolchain"
 PKGDOWNLOAD="https://releases.pagure.org/$PKGNAME/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGDEPENDS="text/docbook-xml text/docbook-xsl text/libxslt"
+PKGDEPENDS="docbook-xml docbook-xsl libxslt"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/www/midori/midori.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/www/midori/midori.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,15 +21,15 @@
 PKGLICENSE="LGPLv21"
 PKGSUMMARY="simple webkit based browser"
 PKGDOWNLOAD="https://github.com/midori-browser/core/releases/download/v$PKGVERSION/$PKGNAME-v$PKGVERSION.tar.gz"
-PKGDEPENDS="compression/libarchive
-            crypto/gcr
-            dev/cmake:build
-            graphics/gtk
-            lang/vala
-            lib/libpeas
-            network/libsoup
-            text/json-glib
-            www/webkitgtk"
+PKGDEPENDS="libarchive
+            gcr
+            cmake:build
+            gtk
+            vala
+            libpeas
+            libsoup
+            json-glib
+            webkitgtk"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/www/webkitgtk/webkitgtk.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/www/webkitgtk/webkitgtk.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,24 +21,24 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="web content engine for Gtk"
 PKGDOWNLOAD="https://webkitgtk.org/releases/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="accessibility/atk
-            dev/cmake:build
-            dev/ninja:build
-            fonts/fontconfig
-            fonts/freetype
-            fonts/harfbuzz
-            graphics/cairo
-            graphics/gtk
-            graphics/libpng
-            graphics/libwebp
-            lib/glib
-            lib/icu
-            lib/libtasn1
-            network/libsoup
-            perl/perl:build
-            python/python:build
-            ruby/ruby:build
-            text/libxslt"
+PKGDEPENDS="atk
+            cmake:build
+            ninja:build
+            fontconfig
+            freetype
+            harfbuzz
+            cairo
+            gtk
+            libpng
+            libwebp
+            glib
+            icu
+            libtasn1
+            libsoup
+            perl:build
+            python:build
+            ruby:build
+            libxslt"
 PKGOPTIONS="GEOLOCATION
             GSTREAMER
             HYPHEN
@@ -77,7 +77,7 @@
 fi
 
 if [ "$GSTREAMER" = "yes" ]; then
-	PKGDEPENDS="multimedia/gstreamer multimedia/gst-plugins-base $PKGDEPENDS"
+	PKGDEPENDS="gstreamer gst-plugins-base $PKGDEPENDS"
 	with_gstreamer="-DENABLE_VIDEO=On -DENABLE_WEB_AUDIO=On"
 else
 	with_gstreamer="-DENABLE_VIDEO=Off -DENABLE_WEB_AUDIO=Off"
@@ -90,14 +90,14 @@
 fi
 
 if [ "$INTROSPECTION" = "yes" ]; then
-	PKGDEPENDS="dev/gobject-introspection:build $PKGDEPENDS"
+	PKGDEPENDS="gobject-introspection:build $PKGDEPENDS"
 	with_introspection="-DENABLE_INTROSPECTION=On"
 else
 	with_introspection="-DENABLE_INTROSPECTION=Off"
 fi
 
 if [ "$JPEG" = "yes" ]; then
-	PKGDEPENDS="graphics/openjpeg $PKGDEPENDS"
+	PKGDEPENDS="openjpeg $PKGDEPENDS"
 	with_jpeg="-DUSE_OPENJPEG=On"
 else
 	with_jpeg="-DUSE_OPENJPEG=Off"
@@ -111,14 +111,14 @@
 fi
 
 if [ "$LIBSECRET" = "yes" ]; then
-	PKGDEPENDS="security/libsecret $PKGDEPENDS"
+	PKGDEPENDS="libsecret $PKGDEPENDS"
 	with_libsecret="-DUSE_LIBSECRET=On"
 else
 	with_libsecret="-DUSE_LIBSECRET=Off"
 fi
 
 if [ "$OPENGL" = "yes" ]; then
-	PKGDEPENDS="graphics/mesa $PKGDEPENDS"
+	PKGDEPENDS="mesa $PKGDEPENDS"
 	with_opengl="-DENABLE_OPENGL=On"
 else
 	with_opengl="-DENABLE_OPENGL=Off"
@@ -144,10 +144,10 @@
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="x11/libxcomposite
-		    x11/libxdamage
-		    x11/libxrender
-		    x11/libxt
+	PKGDEPENDS="libxcomposite
+		    libxdamage
+		    libxrender
+		    libxt
 		    $PKGDEPENDS"
 	with_x="-DENABLE_X11_TARGET=On"
 else
--- a/x11/appres/appres.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/appres/appres.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org tool to see resource seen by an application"
 PKGDOWNLOAD="https://www.x.org/releases/individual/app/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/libx11 x11/libxt x11/util-macros:build x11/xorgproto:build"
+PKGDEPENDS="libx11 libxt util-macros:build xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/bdftopcf/bdftopcf.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/bdftopcf/bdftopcf.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org tool for converting fonts"
 PKGDOWNLOAD="https://www.x.org/releases/individual/app/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/util-macros:build"
+PKGDEPENDS="util-macros:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/bitmap/bitmap.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/bitmap/bitmap.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,12 +21,12 @@
 PKGLICENSE="X.Org bitmap editor and converter"
 PKGSUMMARY="CUSTOM"
 PKGDOWNLOAD="https://www.x.org/releases/individual/app/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/libx11
-            x11/libxaw
-            x11/libxmu
-            x11/util-macros:build
-            x11/xbitmaps
-            x11/xorgproto:build"
+PKGDEPENDS="libx11
+            libxaw
+            libxmu
+            util-macros:build
+            xbitmaps
+            xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/font-util/font-util.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/font-util/font-util.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org font utility"
 PKGDOWNLOAD="https://www.x.org/releases/individual/font/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/util-macros:build"
+PKGDEPENDS="util-macros:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/iceauth/iceauth.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/iceauth/iceauth.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org ICE authority utility"
 PKGDOWNLOAD="https://www.x.org/releases/individual/app/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/libice x11/util-macros:build x11/xorgproto:build"
+PKGDEPENDS="libice util-macros:build xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/imake/imake.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/imake/imake.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD"
 PKGSUMMARY="make utility from X.Org"
 PKGDOWNLOAD="https://www.x.org/releases/individual/util/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/util-macros:build x11/xorgproto:build"
+PKGDEPENDS="util-macros:build xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libdmx/libdmx.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libdmx/libdmx.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org distributed multihead extension library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libdmx-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/libxext x11/util-macros:build x11/xorgproto:build"
+PKGDEPENDS="libxext util-macros:build xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libfontenc/libfontenc.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libfontenc/libfontenc.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org font encoding library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libfontenc-$PKGVERSION.tar.gz"
-PKGDEPENDS="compression/zlib x11/util-macros:build x11/xorgproto:build"
+PKGDEPENDS="zlib util-macros:build xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libfs/libfs.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libfs/libfs.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org font service library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libFS-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/xtrans:build x11/xorgproto:build"
+PKGDEPENDS="xtrans:build xorgproto:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
--- a/x11/libice/libice.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libice/libice.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org inter-client exchange library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libICE-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/util-macros:build x11/xtrans:build"
+PKGDEPENDS="util-macros:build xtrans:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libpciaccess/libpciaccess.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libpciaccess/libpciaccess.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org PCI access library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libpciaccess-0.14.tar.gz"
-PKGDEPENDS="x11/util-macros:build"
+PKGDEPENDS="util-macros:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libsm/libsm.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libsm/libsm.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org session management library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libSM-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/libice x11/util-macros:build x11/xtrans:build x11/xorgproto:build"
+PKGDEPENDS="libice util-macros:build xtrans:build xorgproto:build"
 PKGOPTIONS="UUID"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -33,7 +33,7 @@
 : ${UUID:=yes}
 
 if [ "$UUID" = "yes" ]; then
-	PKGDEPENDS="core/util-linux $PKGDEPENDS"
+	PKGDEPENDS="util-linux $PKGDEPENDS"
 	with_uuid="--with-libuuid"
 else
 	with_uuid="--without-libuuid"
--- a/x11/libx11/libx11.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libx11/libx11.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,10 +21,10 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org client-side library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libX11-1.6.7.tar.gz"
-PKGDEPENDS="x11/libxcb
-            x11/util-macros:build
-            x11/xorgproto:build
-            x11/xtrans:build"
+PKGDEPENDS="libxcb
+            util-macros:build
+            xorgproto:build
+            xtrans:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libxau/libxau.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libxau/libxau.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org authorization library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libXau-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/util-macros:build x11/xorgproto:build"
+PKGDEPENDS="util-macros:build xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libxaw/libxaw.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libxaw/libxaw.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,13 +21,13 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org athena widget library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libXaw-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/libx11
-            x11/libxext
-            x11/libxmu
-            x11/libxpm
-            x11/libxt
-            x11/util-macros:build
-            x11/xorgproto:build"
+PKGDEPENDS="libx11
+            libxext
+            libxmu
+            libxpm
+            libxt
+            util-macros:build
+            xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libxcb/libxcb.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libxcb/libxcb.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,11 +21,11 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org client-side library"
 PKGDOWNLOAD="https://xcb.freedesktop.org/dist/$PKGNAME-$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python:build
-            x11/util-macros:build
-            x11/xorgproto:build
-            x11/libxau
-            x11/libxdmcp"
+PKGDEPENDS="python:build
+            util-macros:build
+            xorgproto:build
+            libxau
+            libxdmcp"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libxcomposite/libxcomposite.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libxcomposite/libxcomposite.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org composite library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libXcomposite-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/libxfixes x11/util-macros:build x11/xorgproto:build"
+PKGDEPENDS="libxfixes util-macros:build xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libxcursor/libxcursor.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libxcursor/libxcursor.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,11 +21,11 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org cursor library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libXcursor-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/libx11
-            x11/libxfixes
-            x11/libxrender
-            x11/util-macros:build
-            x11/xorgproto:build"
+PKGDEPENDS="libx11
+            libxfixes
+            libxrender
+            util-macros:build
+            xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libxdamage/libxdamage.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libxdamage/libxdamage.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org damaged region extension library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libXdamage-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/libx11 x11/libxfixes x11/util-macros:build x11/xorgproto:build"
+PKGDEPENDS="libx11 libxfixes util-macros:build xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libxdmcp/libxdmcp.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libxdmcp/libxdmcp.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org display manager control protocol library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libXdmcp-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/util-macros:build x11/xorgproto:build"
+PKGDEPENDS="util-macros:build xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libxext/libxext.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libxext/libxext.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org extensions library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libXext-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/util-macros:build x11/libx11 x11/xorgproto:build"
+PKGDEPENDS="util-macros:build libx11 xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libxfixes/libxfixes.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libxfixes/libxfixes.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org 'fixes' extension library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libXfixes-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/libx11 x11/util-macros:build x11/xorgproto:build"
+PKGDEPENDS="libx11 util-macros:build xorgproto:build"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/libxfont2/libxfont2.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/libxfont2/libxfont2.sh	Mon Aug 26 12:14:53 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="X.Org font library"
 PKGDOWNLOAD="https://www.x.org/releases/individual/lib/libXfont2-$PKGVERSION.tar.gz"
-PKGDEPENDS="x11/libfontenc x11/util-macros:build x11/xorgproto:build x11/xtrans"
+PKGDEPENDS="libfontenc util-macros:build xorgproto:build xtrans"
 PKGOPTIONS="BZIP2 FREETYPE"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -34,14 +34,14 @@
 : ${FREETYPE:=yes}
 
 if [ "$BZIP2" = "yes" ]; then