# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1567115700 -7200
# Node ID 60d881a89c6acc45ef18369e4a736e473c080657
# Parent  3d175b5fc0930487cdd424bdd2a18956de534691
vanilla: fix many dependencies

diff -r 3d175b5fc093 -r 60d881a89c6a Scripts/lint-deps.sh
--- a/Scripts/lint-deps.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/Scripts/lint-deps.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -26,6 +26,12 @@
 
 TOP=$(realpath $(dirname $0)/../)
 PROGNAME=$(basename $0)
+TMPDIR=/tmp/vanilla-lint-deps
+
+clean()
+{
+	rm -rf $TMPDIR
+}
 
 usage()
 {
@@ -35,8 +41,8 @@
 
 check()
 {(
-	name=$(basename $1).sh
-	failed=0
+	local name=$(basename $1).sh
+	local failed=0
 
 	cd $TOP/$1
 
@@ -48,16 +54,16 @@
 	. ./$name
 
 	for d in $PKGDEPENDS; do
-		dep=$TOP/${d%:*}/$(basename ${d%:*}).sh
-
-		if [ ! -f $dep ]; then
+		local dep=${d%:*}
+	
+		if ! grep -q $dep $TMPDIR/list; then
 			# Only print "error" once.
 			if [ $failed -eq 0 ]; then
 				failed=1
 				echo "error"
 			fi
 
-			echo "missing ${d%:*}" 1>&2
+			echo "missing $dep" 1>&2
 		fi
 	done
 
@@ -66,6 +72,17 @@
 	fi
 )}
 
+trap "clean; exit 1" INT QUIT TERM
+
+rm -rf $TMPDIR
+mkdir -p $TMPDIR
+
+# First, retrieve all packages.
+$TOP/Scripts/list.sh | sed -re "s|[^/]*/||" > $TMPDIR/list
+
+# Now check dependencies.
 $TOP/Scripts/list.sh $1 | while read -r pkg; do
 	check $pkg
 done
+
+clean
diff -r 3d175b5fc093 -r 60d881a89c6a audio/mpg123/mpg123.sh
--- a/audio/mpg123/mpg123.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/audio/mpg123/mpg123.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -43,7 +43,7 @@
 fi
 
 if [ "$JACK" = "yes" ]; then
-	PKGDEPENDS="audio/jack $PKGDEPENDS"
+	PKGDEPENDS="jack2 $PKGDEPENDS"
 	with_audio="jack $with_audio"
 fi
 
diff -r 3d175b5fc093 -r 60d881a89c6a audio/openal-soft/openal-soft.sh
--- a/audio/openal-soft/openal-soft.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/audio/openal-soft/openal-soft.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -44,14 +44,14 @@
 fi
 
 if [ "$EXAMPLES" = "yes" ]; then
-	PKGDEPENDS="sdl2 audio/ffmpeg $PKGDEPENDS"
+	PKGDEPENDS="sdl2 ffmpeg $PKGDEPENDS"
 	with_examples="-DALSOFT_EXAMPLES=On"
 else
 	with_examples="-DALSOFT_EXAMPLES=Off"
 fi
 
 if [ "$JACK" = "yes" ]; then
-	PKGDEPENDS="audio/jack $PKGDEPENDS"
+	PKGDEPENDS="jack2 $PKGDEPENDS"
 	with_jack="-DALSOFT_REQUIRE_JACK=On"
 else
 	with_jack="-DALSOFT_REQUIRE_JACK=Off"
diff -r 3d175b5fc093 -r 60d881a89c6a audio/pulseaudio/pulseaudio.sh
--- a/audio/pulseaudio/pulseaudio.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/audio/pulseaudio/pulseaudio.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -32,7 +32,7 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}
 : ${ALSA:=yes}
-: ${AVAHI:=no}          # TODO: set to yes once avahi is there
+: ${AVAHI:=yes}
 : ${BLUETOOTH:=no}      # TODO: set to on once sbc is there (for bluez)
 : ${GTK:=yes}
 : ${IPV6:=yes}
@@ -51,7 +51,7 @@
 fi
 
 if [ "$AVAHI" = "yes" ]; then
-	PKGDEPENDS="network/avahi $PKGDEPENDS"
+	PKGDEPENDS="avahi $PKGDEPENDS"
 	with_avahi="--enable-avahi"
 else
 	with_avahi="--disable-avahi"
@@ -78,7 +78,7 @@
 fi
 
 if [ "$JACK" = "yes" ]; then
-	PKGDEPENDS="audio/jack $PKGDEPENDS"
+	PKGDEPENDS="jack2 $PKGDEPENDS"
 	with_jack="--enable-jack"
 else
 	with_jack="--disable-jack"
@@ -98,7 +98,7 @@
 fi
 
 if [ "$SSL" = "yes" ]; then
-	PKGDEPENDS="crypto/openssl $PKGDEPENDS"
+	PKGDEPENDS="libressl $PKGDEPENDS"
 	with_ssl="--enable-openssl"
 else
 	with_ssl="--disable-openssl"
@@ -112,7 +112,7 @@
 fi
 
 if [ "$X" = "yes" ]; then
-	PKGDEPENDS="libx11 libxcb libice libsm libxtst"
+	PKGDEPENDS="libx11 libxcb libice libsm libxtst $PKGDEPENDS"
 	with_x="--enable-x11"
 else
 	with_x="--disable-x11"
diff -r 3d175b5fc093 -r 60d881a89c6a audio/sdl2-mixer/sdl2-mixer.sh
--- a/audio/sdl2-mixer/sdl2-mixer.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/audio/sdl2-mixer/sdl2-mixer.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -52,14 +52,13 @@
 fi
 
 if [ "$OGG" = "yes" ]; then
-	PKGDEPENDS="audio/ogg $PKGDEPENDS"
+	PKGDEPENDS="libogg $PKGDEPENDS"
 	with_ogg="--enable-music-ogg"
 else
 	with_ogg="--disable-music-ogg"
 fi
 
 if [ "$WAVE" = "yes" ]; then
-	PKGDEPENDS="audio/wave $PKGDEPENDS"
 	with_wave="--enable-music-wave"
 else
 	with_wave="--disable-music-wave"
diff -r 3d175b5fc093 -r 60d881a89c6a dev/make/make.sh
--- a/dev/make/make.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/dev/make/make.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -19,7 +19,7 @@
 PKGVERSION=4.2.1
 PKGREVISION=1
 PKGLICENSE="GPLv3+"
-PKGSUMMARY="short summary"
+PKGSUMMARY="GNU make"
 PKGDOWNLOAD="http://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
 PKGOPTIONS="GUILE NLS"
 
@@ -31,11 +31,11 @@
 : ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
-: ${GUILE:=yes}
+: ${GUILE:=no}  # TODO: add once guile is there
 : ${NLS:=yes}
 
 if [ "$GUILE" = "yes" ]; then
-	PKGDEPENDS="dev/guile $PKGDEPENDS"
+	PKGDEPENDS="guile $PKGDEPENDS"
 	with_nls="--with-guile"
 else
 	with_guile="--without-guile"
diff -r 3d175b5fc093 -r 60d881a89c6a emulation/libretro-blastem/libretro-blastem.sh
--- a/emulation/libretro-blastem/libretro-blastem.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/emulation/libretro-blastem/libretro-blastem.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -25,7 +25,7 @@
 PKGSUMMARY="libretro implementation for blastem (Sega Mega Drive)"
 PKGDOWNLOAD="https://github.com/libretro/blastem/archive/$_COMMIT.tar.gz
              https://raw.github.com/libretro/libretro-super/master/dist/info/blastem_libretro.info"
-PKGDEPENDS="multimedia/sdl2:build"
+PKGDEPENDS="sdl2:build"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
diff -r 3d175b5fc093 -r 60d881a89c6a emulation/retroarch/retroarch.sh
--- a/emulation/retroarch/retroarch.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/emulation/retroarch/retroarch.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -97,7 +97,7 @@
 fi
 
 if [ "$JACK" = "yes" ]; then
-	PKGDEPENDS="audio/jack $PKGDEPENDS"
+	PKGDEPENDS="jack2 $PKGDEPENDS"
 	with_jack="--enable-jack"
 else
 	with_jack="--disable-jack"
@@ -142,7 +142,7 @@
 fi
 
 if [ "$SDL2" = "yes" ]; then
-	PKGDEPENDS="multimedia/sdl2 $PKGDEPENDS"
+	PKGDEPENDS="sdl2 $PKGDEPENDS"
 	with_sdl2="--enable-sdl2"
 else
 	with_sdl2="--disable-sdl2"
@@ -181,7 +181,7 @@
 	            libxext
 	            libxinerama
 	            libxrandr
-	            x11/libxshm
+	            libxshmfence
 	            libxxf86vm $PKGDEPENDS"
 	with_x="--enable-x11 --enable-xinerama --enable-xrandr"
 else
diff -r 3d175b5fc093 -r 60d881a89c6a games/wesnoth/wesnoth.sh
--- a/games/wesnoth/wesnoth.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/games/wesnoth/wesnoth.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -29,7 +29,7 @@
             cairo
             sdl2-image
             boost
-            multimedia/sdl2"
+            sdl2"
 PKGOPTIONS="FRIBIDI NLS NOTIFICATIONS"
 
 : ${CC:=clang}
@@ -41,7 +41,7 @@
 : ${NOTIFICATIONS:=yes}
 
 if [ "$FRIBIDI" = "yes" ]; then
-	PKGDEPENDS="fonts/fribidi $PKGDEPENDS"
+	PKGDEPENDS="fribidi $PKGDEPENDS"
 	with_fribidi="-DENABLE_FRIBIDI=On"
 else
 	with_fribidi="-DENABLE_FRIBIDI=Off"
diff -r 3d175b5fc093 -r 60d881a89c6a graphics/gtk/gtk.sh
--- a/graphics/gtk/gtk.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/graphics/gtk/gtk.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -49,7 +49,7 @@
 fi
 
 if [ "$WAYLAND" = "yes" ] || [ "$X" = "yes" ]; then
-	PKGDEPENDS="font/pango $PKGDEPENDS"
+	PKGDEPENDS="pango $PKGDEPENDS"
 
 	if [ "$WAYLAND" = "yes" ]; then
 		PKGDEPENDS="wayland $PKGDEPENDS"
diff -r 3d175b5fc093 -r 60d881a89c6a graphics/libwebp/libwebp.sh
--- a/graphics/libwebp/libwebp.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/graphics/libwebp/libwebp.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -37,7 +37,7 @@
 : ${TIFF:=yes}
 
 if [ "$JPEG" = "yes" ]; then
-	PKGDEPENDS="graphics/libjpeg $PKGDEPENDS"
+	PKGDEPENDS="libjpeg-turbo $PKGDEPENDS"
 	with_jpeg="--enable-jpeg"
 else
 	with_jpeg="--disable-jpeg"
diff -r 3d175b5fc093 -r 60d881a89c6a lib/gvfs/gvfs.sh
--- a/lib/gvfs/gvfs.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/lib/gvfs/gvfs.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -52,7 +52,7 @@
 : ${UDEV:=yes}
 
 if [ "$ADMIN" = "yes" ]; then
-	PKGDEPENDS="lib/libcap polkit $PKGDEPENDS"
+	PKGDEPENDS="libcap polkit $PKGDEPENDS"
 	with_admin="-D admin=true"
 else
 	with_admin="-D admin=false"
diff -r 3d175b5fc093 -r 60d881a89c6a multimedia/gst-plugins-good/gst-plugins-good.sh
--- a/multimedia/gst-plugins-good/gst-plugins-good.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/multimedia/gst-plugins-good/gst-plugins-good.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -73,7 +73,7 @@
 fi
 
 if [ "$JACK" = "yes" ]; then
-	PKGDEPENDS="audio/jack $PKGDEPENDS"
+	PKGDEPENDS="jack2 $PKGDEPENDS"
 	with_jack="-D jack=enabled"
 else
 	with_jack="-D jack=disabled"
@@ -108,7 +108,7 @@
 fi
 
 if [ "$PNG" = "yes" ]; then
-	PKGDEPENDS="lib/libpng $PKGDEPENDS"
+	PKGDEPENDS="libpng $PKGDEPENDS"
 	with_png="-D png=enabled"
 else
 	with_png="-D png=disabled"
diff -r 3d175b5fc093 -r 60d881a89c6a multimedia/sdl2/sdl2.sh
--- a/multimedia/sdl2/sdl2.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/multimedia/sdl2/sdl2.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -164,7 +164,7 @@
 fi
 
 if [ "$JACK" = "yes" ]; then
-	PKGDEPENDS="audio/jack $PKGDEPENDS"
+	PKGDEPENDS="jack2 $PKGDEPENDS"
 	with_jack="--enable-jack"
 else
 	with_jack="--disable-jack"
@@ -251,7 +251,7 @@
 	            libxinerama
 	            libxrandr
 	            libxscrnsaver
-	            x1/libxi $PKGDEPENDS"
+	            libxi $PKGDEPENDS"
 	with_x="--enable-video-x11"
 	with_x="--enable-video-x11-scrnsaver $with_x"
 	with_x="--enable-video-x11-xcursor $with_x"
diff -r 3d175b5fc093 -r 60d881a89c6a qt/qtbase/qtbase.sh
--- a/qt/qtbase/qtbase.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/qt/qtbase/qtbase.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -194,7 +194,7 @@
 fi
 
 if [ "$JPEG" = "yes" ]; then
-	PKGDEPENDS="lib/libjpeg-turbo $PKGDEPENDS"
+	PKGDEPENDS="libjpeg-turbo $PKGDEPENDS"
 	with_jpeg="-system-libjpeg"
 else
 	with_jpeb="-no-libjpeg"
@@ -207,7 +207,7 @@
 fi
 
 if [ "$PNG" = "yes" ]; then
-	PKGDEPENDS="lib/libpng $PKGDEPENDS"
+	PKGDEPENDS="libpng $PKGDEPENDS"
 	with_png="-system-libpng"
 else
 	with_png="-no-libpng"
diff -r 3d175b5fc093 -r 60d881a89c6a security/shadow/shadow.sh
--- a/security/shadow/shadow.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/security/shadow/shadow.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -74,7 +74,7 @@
 fi
 
 if [ "$PAM" = "yes" ]; then
-	PKGDEPENDS="security/pam $PKGDEPENDS"
+	PKGDEPENDS="linux-pam $PKGDEPENDS"
 	with_pam="--with-libpam"
 else
 	with_pam="--without-libpam"
diff -r 3d175b5fc093 -r 60d881a89c6a text/libxslt/libxslt.sh
--- a/text/libxslt/libxslt.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/text/libxslt/libxslt.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -35,7 +35,7 @@
 : ${CRYPTO:=yes}
 
 if [ "$CRYPTO" = "yes" ]; then
-	PKGDEPENDS="security/libgcrypt $PKGDEPENDS"
+	PKGDEPENDS="libgcrypt $PKGDEPENDS"
 	with_crypto="--with-crypto"
 else
 	with_crypto="--without-crypto"
diff -r 3d175b5fc093 -r 60d881a89c6a www/webkitgtk/webkitgtk.sh
--- a/www/webkitgtk/webkitgtk.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/www/webkitgtk/webkitgtk.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -104,7 +104,7 @@
 fi
 
 if [ "$NOTIFICATIONS" = "yes" ]; then
-	PKGDEPENDS="desktop/notifications $PKGDEPENDS"
+	PKGDEPENDS="libnotify $PKGDEPENDS"
 	with_notifications="-DUSE_LIBNOTIFY=On"
 else
 	with_notifications="-DUSE_LIBNOTIFY=Off"
diff -r 3d175b5fc093 -r 60d881a89c6a xfce/xfce4-terminal/xfce4-terminal.sh
--- a/xfce/xfce4-terminal/xfce4-terminal.sh	Thu Aug 29 23:50:00 2019 +0200
+++ b/xfce/xfce4-terminal/xfce4-terminal.sh	Thu Aug 29 23:55:00 2019 +0200
@@ -22,10 +22,10 @@
 PKGSUMMARY="Xfce simple multimedia player"
 PKGDOWNLOAD="http://archive.xfce.org/src/apps/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.bz2"
 PKGDEPENDS="gtk
-            graphics/vte
             glib
             libx11
             libxfce4ui
+            vte
             xfconf"
 PKGOPTIONS="NLS"