Mercurial > vanilla
changeset 657:b0fd9c97761e
vanilla: fix all dependencies
line wrap: on
line diff
--- a/core/bash-completion/bash-completion.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/core/bash-completion/bash-completion.sh Tue Jul 30 20:40:00 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="core/bash" +PKGDEPENDS="shells/bash" build() {
--- a/core/consolekit2/consolekit2.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/core/consolekit2/consolekit2.sh Tue Jul 30 20:40:00 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="core/dbus lib/glib x11/libx11" +PKGDEPENDS="network/dbus lib/glib x11/libx11" PKGOPTIONS="PAM POLKIT SELINUX UDEV" : ${CHOST:=$(uname -m)-linux-musl}
--- a/core/kmod/kmod.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/core/kmod/kmod.sh Tue Jul 30 20:40:00 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 lib/xz" +PKGDEPENDS="compression/zlib" PKGOPTIONS="SSL XZ ZLIB" : ${CHOST:=$(uname -m)-linux-musl} @@ -41,7 +41,7 @@ with_ssl="--without-openssl" fi if [ "$XZ" = "yes" ]; then - PKGDEPENDS="lib/xz $PKGDEPENDS" + PKGDEPENDS="compression/xz $PKGDEPENDS" with_xz="--with-xz" else with_xz="--without-xz"
--- a/core/tar/tar.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/core/tar/tar.sh Tue Jul 30 20:40:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="GPLv3+" PKGSUMMARY="GNU archiving utility" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" +PKGDEPENDS="" PKGOPTIONS="ACL NLS" : ${CHOST:=$(uname -m)-linux-musl}
--- a/desktop/icon-naming-utils/icon-naming-utils.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/desktop/icon-naming-utils/icon-naming-utils.sh Tue Jul 30 20:40:00 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/perl-xml-simple" +PKGDEPENDS="perl/perl perl/p5-xml-simple" build() {
--- a/dev/help2man/help2man.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/dev/help2man/help2man.sh Tue Jul 30 20:40:00 2019 +0200 @@ -34,7 +34,7 @@ if [ "$NLS" = "yes" ]; then PKGDEPENDS="core/gettext:build $PKGDEPENDS" - PKGDEPENDS="perl/perl-locale-gettext $PKGDEPENDS" + PKGDEPENDS="perl/p5-locale-gettext $PKGDEPENDS" with_nls="--enable-nls" else with_nls="--disable-nls"
--- a/dev/intltool/intltool.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/dev/intltool/intltool.sh Tue Jul 30 20:40:00 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/perl-xml-parser" +PKGDEPENDS="perl/p5-xml-parser" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/graphics/gtk/gtk.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/graphics/gtk/gtk.sh Tue Jul 30 20:40:00 2019 +0200 @@ -49,7 +49,7 @@ fi if [ "$WAYLAND" = "yes" ] || [ "$X" = "yes" ]; then - PKGDEPENDS="graphics/pango $PKGDEPENDS" + PKGDEPENDS="font/pango $PKGDEPENDS" if [ "$WAYLAND" = "yes" ]; then PKGDEPENDS="graphics/wayland $PKGDEPENDS"
--- a/graphics/gtk2/gtk2.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/graphics/gtk2/gtk2.sh Tue Jul 30 20:40:00 2019 +0200 @@ -24,7 +24,7 @@ PKGDEPENDS="accessibility/atk fonts/fontconfig graphics/gdk-pixbuf - graphics/pango + fonts/pango lib/glib x11/libx11 x11/libxcomposite
--- a/graphics/libtiff/libtiff.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/graphics/libtiff/libtiff.sh Tue Jul 30 20:40:00 2019 +0200 @@ -58,7 +58,7 @@ fi if [ "$ZSTD" = "yes" ]; then - PKGDEPENDS="lib/zstd $PKGDEPENDS" + PKGDEPENDS="compression/zstd $PKGDEPENDS" with_zstd="--enable-zstd" else with_zstd="--disable-zstd"
--- a/graphics/wayland/wayland.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/graphics/wayland/wayland.sh Tue Jul 30 20:40:00 2019 +0200 @@ -34,7 +34,7 @@ : ${DOXYGEN:=yes} if [ "$DTD" = "yes" ]; then - PKGDEPENDS="lib/libxml2 $PKGDEPENDS" + PKGDEPENDS="text/libxml2 $PKGDEPENDS" with_dtd="--enable-dtd-validation" else with_dtd="--disable-dtd-validation"
--- a/lib/libxklavier/libxklavier.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/lib/libxklavier/libxklavier.sh Tue Jul 30 20:40:00 2019 +0200 @@ -22,11 +22,11 @@ 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/libxml2 - x11/libxmodmap" + x11/xmodmap" : ${CC:=clang} : ${CFLAGS:=-O2}
--- a/mail/neomutt/neomutt.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/mail/neomutt/neomutt.sh Tue Jul 30 20:40:00 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="dev/gettext:build lang/tcl:build lib/ncurses text/libxslt:build www/w3m:build" +PKGDEPENDS="core/gettext:build lang/tcl:build lib/ncurses text/libxslt:build www/w3m:build" PKGOPTIONS="IDN2 NLS NOTMUCH SSL" PKGPROTECT="etc/neomuttrc"
--- a/mate/mate-desktop/mate-desktop.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/mate/mate-desktop/mate-desktop.sh Tue Jul 30 20:40:00 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 lib/gobject-introspection graphics/gtk" +PKGDEPENDS="lib/glib dev/gobject-introspection graphics/gtk" PKGOPTIONS="NLS" : ${CHOST:=$(uname -m)-linux-musl}
--- a/misc/iso-codes/iso-codes.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/misc/iso-codes/iso-codes.sh Tue Jul 30 20:40:00 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:build:build" +PKGDEPENDS="core/gettext:build" build() {
--- a/misc/itstool/itstool.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/misc/itstool/itstool.sh Tue Jul 30 20:40:00 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="lib/libxml2 python/python" +PKGDEPENDS="text/libxml2 python/python" build() {
--- a/misc/shared-mime-info/shared-mime-info.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/misc/shared-mime-info/shared-mime-info.sh Tue Jul 30 20:40:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv2" PKGSUMMARY="mime database" PKGDOWNLOAD="http://freedesktop.org/~hadess/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="lib/glib lib/libxml2" +PKGDEPENDS="lib/glib text/libxml2" PKGOPTIONS="NLS" : ${CHOST:=$(uname -m)-linux-musl}
--- a/network/curl/curl.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/network/curl/curl.sh Tue Jul 30 20:40:00 2019 +0200 @@ -36,7 +36,7 @@ : ${SSL:=yes} if [ "$IDN2" = "yes" ]; then - PKGDEPENDS="core/libidn2 $PKGDEPENDS" + PKGDEPENDS="dns/libidn2 $PKGDEPENDS" with_idn2="--with-libidn2" else with_idn2="--without-libidn2" @@ -56,7 +56,7 @@ fi if [ "$SSH" = "yes" ]; then - PKGDEPENDS="lib/libssh2 $PKGDEPENDS" + PKGDEPENDS="network/libssh2 $PKGDEPENDS" with_ssh="--with-libssh2" else with_ssh="--without-libssh2"
--- a/network/wget/wget.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/network/wget/wget.sh Tue Jul 30 20:40:00 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="network/gnutls lib/libunistring compression/zlib" +PKGDEPENDS="lib/libunistring compression/zlib" PKGOPTIONS="NLS SSL UUID" : ${CHOST:=$(uname -m)-linux-musl} @@ -45,7 +45,7 @@ PKGDEPENDS="crypto/libressl $PKGDEPENDS" with_ssl="--with-ssl=openssl" elif [ "$SSL" = "gnutls" ]; then - PKGDEPENDS="network/gnutls $PKGDEPENDS" + PKGDEPENDS="crypto/gnutls $PKGDEPENDS" with_ssl="--with-ssl=gnutls" else with_ssl="--without-ssl"
--- a/python/py-pygments/py-pygments.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/python/py-pygments/py-pygments.sh Tue Jul 30 20:40:00 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" +PKGDEPENDS="python/python" build() {
--- a/security/polkit/polkit.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/security/polkit/polkit.sh Tue Jul 30 20:40:00 2019 +0200 @@ -38,7 +38,7 @@ PKGDEPENDS="security/linux-pam $PKGDEPENDS" with_pam="--with-authfw=pam" else - PKGDEPENDS="core/shadow $PKGDEPENDS" + PKGDEPENDS="security/shadow $PKGDEPENDS" with_pam="--with-authfw=shadow" fi
--- a/shells/zsh/zsh.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/shells/zsh/zsh.sh Tue Jul 30 20:40:00 2019 +0200 @@ -44,7 +44,7 @@ fi if [ "$GDBM" = "yes" ]; then - PKGDEPENDS="db/gdbm $PKGDEPENDS" + PKGDEPENDS="databases/gdbm $PKGDEPENDS" with_gdbm="--enable-gdbm" else with_gdbm="--disable-gdbm"
--- a/text/libcroco/libcroco.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/text/libcroco/libcroco.sh Tue Jul 30 20:40:00 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 lib/libxml2" +PKGDEPENDS="lib/glib text/libxml2" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/text/libxslt/libxslt.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/text/libxslt/libxslt.sh Tue Jul 30 20:40:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="CUSTOM" PKGSUMMARY="XML stylesheet transformation library" PKGDOWNLOAD="ftp://xmlsoft.org/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="lib/libxml2" +PKGDEPENDS="text/libxml2" PKGOPTIONS="CRYPTO" : ${CHOST:=$(uname -m)-linux-musl}
--- a/x11/libsm/libsm.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/x11/libsm/libsm.sh Tue Jul 30 20:40:00 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="x11/libice x11/util-macros:build x11/xtrans:build x11/xorgproto:build" PKGOPTIONS="UUID" : ${CHOST:=$(uname -m)-linux-musl}
--- a/x11/xdpyinfo/xdpyinfo.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/x11/xdpyinfo/xdpyinfo.sh Tue Jul 30 20:40:00 2019 +0200 @@ -31,9 +31,9 @@ x11/libxtst x11/util-macros:build x11/xorgproto:build - x11/xxf86dga - x11/xxf86misc - x11/xxf86vm" + x11/libxxf86dga + x11/libxxf86misc + x11/libxxf86vm" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/x11/xkbcomp/xkbcomp.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/x11/xkbcomp/xkbcomp.sh Tue Jul 30 20:40:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="CUSTOM" PKGSUMMARY="X.Org keyboard description compiler" PKGDOWNLOAD="https://www.x.org/releases/individual/app/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="x11/bison:build +PKGDEPENDS="dev/bison:build x11/libx11 x11/libxkbfile x11/util-macros:build
--- a/x11/xorg-server/xorg-server.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/x11/xorg-server/xorg-server.sh Tue Jul 30 20:40:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="CUSTOM" PKGSUMMARY="X.Org display server" PKGDOWNLOAD="https://www.x.org/releases/individual/xserver/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="x11/libpciaccess x11/libdrm" +PKGDEPENDS="x11/libpciaccess graphics/libdrm" PKGOPTIONS="GLAMOR UDEV WAYLAND" : ${CHOST:=$(uname -m)-linux-musl}
--- a/xfce/exo/exo.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/xfce/exo/exo.sh Tue Jul 30 20:40:00 2019 +0200 @@ -25,7 +25,7 @@ graphics/gtk2 lib/glib perl/perl - perl/perl-uri + perl/p5-uri x11/libx11 xfce/libxfce4ui xfce/libxfce4util"
--- a/xfce/libxfce4ui/libxfce4ui.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/xfce/libxfce4ui/libxfce4ui.sh Tue Jul 30 20:40:00 2019 +0200 @@ -22,7 +22,7 @@ PKGSUMMARY="Xfce user interface library" PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" PKGDEPENDS="graphics/gtk2 - graphics/gtk3 + graphics/gtk lib/glib x11/libsm x11/libx11
--- a/xfce/xfce4-panel/xfce4-panel.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/xfce/xfce4-panel/xfce4-panel.sh Tue Jul 30 20:40:00 2019 +0200 @@ -24,7 +24,7 @@ PKGDEPENDS="desktop/libwnck2 graphics/cairo graphics/gtk2 - graphics/gtk3 + graphics/gtk lib/dbus-glib lib/glib x11/libx11
--- a/xfce/xfce4-session/xfce4-session.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/xfce/xfce4-session/xfce4-session.sh Tue Jul 30 20:40:00 2019 +0200 @@ -21,17 +21,17 @@ PKGLICENSE="GPLv2" PKGSUMMARY="Xfce session manager" PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" -PKGDEPENDS="core/dbus - core/which +PKGDEPENDS="core/which desktop/libwnck2 lib/dbus-glib lib/glib + network/dbus x11/iceauth x11/libsm x11/libx11 xfce/libxfce4ui xfce/libxfce4util - xfce/xfcont" + xfce/xfconf" PKGOPTIONS="POLICYKIT UPOWER"
--- a/xfce/xfconf/xfconf.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/xfce/xfconf/xfconf.sh Tue Jul 30 20:40:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv2" PKGSUMMARY="D-Bus based configuration daemon and library for xfce" PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" -PKGDEPENDS="core/dbus +PKGDEPENDS="network/dbus lib/dbus-glib lib/glib xfce/libxfce4util"
--- a/xfce/xfdesktop/xfdesktop.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/xfce/xfdesktop/xfdesktop.sh Tue Jul 30 20:40:00 2019 +0200 @@ -28,7 +28,7 @@ xfce/exo xfce/garcon xfce/libxfce4util - xfce/libxfceui + xfce/libxfce4ui xfce/xfconf" : ${CHOST:=$(uname -m)-linux-musl}
--- a/xfce/xfwm4/xfwm4.sh Tue Jul 30 20:31:00 2019 +0200 +++ b/xfce/xfwm4/xfwm4.sh Tue Jul 30 20:40:00 2019 +0200 @@ -21,12 +21,12 @@ PKGLICENSE="GPLv2" PKGSUMMARY="Xfce window manager" PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" -PKGDEPENDS="core/dbus +PKGDEPENDS="network/dbus desktop/libwnck2 desktop/startup-notification + graphics/libdrm graphics/gtk2 lib/dbus-glib - x11/libdrm x11/libsm x11/libx11 x11/libxcomposite