Fix dependencies and indentation for hybris-related packages

hybris/drihybris/APKBUILD

@@ -7,10 +7,9 @@ url="https://github.com/NotKit/drihybris"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc $pkgname-dev"
-depends=
-makedepends="autoconf automake util-macros
+depends_dev="drihybrisproto"
+makedepends="autoconf automake libtool util-macros
 	xorg-server-dev libxi-dev drihybrisproto"
-
 source="$pkgname-$_commit.tar.gz::https://github.com/NotKit/drihybris/archive/$_commit.tar.gz"
 
 builddir="$srcdir"/$pkgname-$_commit

hybris/glamor-hybris/APKBUILD

@@ -8,7 +8,7 @@ arch="all"
 license="MIT"
 subpackages="$pkgname-doc $pkgname-dev"
 depends=
-makedepends="autoconf automake util-macros
+makedepends="autoconf automake util-macros libtool
 	xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto drihybrisproto drihybris-dev libepoxy-dev
 	libhybris-dev"

hybris/libhybris/libhybris-egl.post-install

 #!/bin/sh
-ARCH=`uname -m`
+ARCH=$(uname -m)
 
 if [ ! -f /etc/ld-musl-$ARCH.path ]; then
-    echo "/usr/lib/libhybris-egl:/lib:/usr/local/lib:/usr/lib" > /etc/ld-musl-$ARCH.path
+	echo "/usr/lib/libhybris-egl:/lib:/usr/local/lib:/usr/lib" > /etc/ld-musl-$ARCH.path
 fi

hybris/lxc-android/APKBUILD

@@ -36,5 +36,5 @@ package() {
 		"${pkgdir}/etc/init.d/lxc-android"
 }
 sha512sums="aed41538bc19fd228605bef4bf089a7bbc96964211abe5932e8685d089c32fce11fa7ba1068ad28f345895fef0d02dd388c4faef3c6abdbfbdd10ba96fcbbed0  lxc-android-.tar.gz
-4a5c35f9546193b1a9379236ed58e9ef10bbb8e94a76c7508b3b6c1eaf26f70404f3a94cc1a22c96c54bbd1605ad62963338f72355e0fd6eb96e5b4d3fa27bbb  pre-start.sh
+ef7081ea55a1acd5a6c5a973b4a7fc79bad4d5fdc721bc481e4ed92962a8ba9b70634e2a0a8f0afd28c14bd1fd4e1956914f68239c3dc34e41e167254252b1df  pre-start.sh
 ad373e26fb4850f887ca0be76a4c5f19115e214dcbdc315cf24e41eabfd03eebf8f19085a49c97661861b16e8005355c7fd10e86acdb4593d43250e3fed998fb  lxc-android.init"

hybris/lxc-android/lxc-android.post-install

 #!/bin/sh
-
-if [ "`id -u user`" == "1000" ]; then
-	# Change default user uid from 1000 to 100000 to avoid conflicts.
-	# Beware that it ./pmbootstrap install creates user after installing
-	# packages, so it will work only when package is installed on live system
-
-	# usermod -u 100000 user doesn't work due to "user" user is being used
-	sed -i -e 's/^\(user:[^:]\):[0-9]*:[0-9]*:/\1:100000:100000:/' /etc/passwd
-	groupmod -g 100000 user
-	chown -R 100000:100000 /home/user
-fi
-
 groupadd -g 1000 aid_system
 groupadd -g 1003 aid_graphics
 groupadd -g 1004 aid_input

hybris/lxc-android/pre-start.sh

@@ -3,7 +3,7 @@ lxc_config_path="$(dirname $LXC_CONFIG_FILE)"
 
 # Allow pre-start.sh to be provided by device package, otherwise use the default one
 if [ -f "$lxc_config_path/pre-start.custom.sh" ]; then
-   exec $lxc_config_path/pre-start.custom.sh
+	exec $lxc_config_path/pre-start.custom.sh
 else
-   exec $lxc_config_path/pre-start.default.sh
+	exec $lxc_config_path/pre-start.default.sh
 fi

hybris/xf86-video-hwcomposer/APKBUILD

@@ -6,10 +6,10 @@ url="https://github.com/NotKit/xf86-video-hwcomposer"
 arch="armhf aarch64"
 license="MIT"
 depends="drihybris glamor-hybris"
-makedepends="autoconf automake util-macros
+makedepends="autoconf automake util-macros libtool
 	xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto xf86dgaproto glamor-hybris-dev
-	libhybris-dev libhybris libhybris-7.1"
+	libhybris-dev libhybris libhybris-7.1 drihybris-dev"
 _commit=60f7bfcecc31253ed71d3e86ed2fb408ddafc5d0
 source="$pkgname-$_commit.tar.gz::https://github.com/NotKit/$pkgname/archive/$_commit.tar.gz
 	30-modules-hybris.conf"
@@ -61,7 +61,6 @@ package() {
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 	install -Dm644 "$srcdir"/30-modules-hybris.conf \
 		"$pkgdir"/etc/X11/xorg.conf.d/30-modules-hybris.conf
-
 }
 
 _specific() {