diff --git a/.gitignore b/.gitignore
index 850a2ba..e67e497 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.gitignore
+
 _buildscripts
 _repo
 _sources
@@ -7,12 +9,12 @@ src
 dbg
 hdr
 *~
-
 build.sh
 clean-builddir.sh
 clean-workdir.sh
 copy.sh
 copy-any.sh
+fakeuname
 get-any.sh
 makepkg
 move.sh
diff --git a/lib32-alsa-plugins/PKGBUILD b/lib32-alsa-plugins/PKGBUILD
index 7e3a3e5..7964231 100644
--- a/lib32-alsa-plugins/PKGBUILD
+++ b/lib32-alsa-plugins/PKGBUILD
@@ -12,7 +12,7 @@ pkgdesc="Extra alsa plugins (32-bit)"
 arch=(x86_64)
 url="http://www.alsa-project.org"
 license=(GPL)
-depends=(lib32-alsa-lib $_pkgbasename)
+depends=(lib32-alsa-lib $_pkgbasename=$pkgver)
 makedepends=(lib32-{libpulse,jack,speex,libsamplerate} gcc-multilib)
 optdepends=('lib32-libpulse: PulseAudio plugin'
             'lib32-jack: Jack plugin'
diff --git a/lib32-atk/PKGBUILD b/lib32-atk/PKGBUILD
index 646bd3d..ecb88f4 100644
--- a/lib32-atk/PKGBUILD
+++ b/lib32-atk/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="A library providing a set of interfaces for accessibility (32-bit)"
 arch=('x86_64')
 license=('LGPL')
-depends=('lib32-glib2' $_pkgbasename)
+depends=('lib32-glib2' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2)
diff --git a/lib32-attr/PKGBUILD b/lib32-attr/PKGBUILD
index 4621d58..1eae71d 100644
--- a/lib32-attr/PKGBUILD
+++ b/lib32-attr/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Extended attribute support library for ACL support (32-bit)"
 arch=(x86_64)
 url="http://oss.sgi.com/projects/xfs/"
 license=('LGPL')
-depends=('lib32-glibc' $_pkgbasename) 
+depends=('lib32-glibc' $_pkgbasename=$pkgver) 
 makedepends=('gcc-multilib' 'gettext')
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/attr/attr-${pkgver}.src.tar.gz)
diff --git a/lib32-audiofile/PKGBUILD b/lib32-audiofile/PKGBUILD
index 641303a..69e8934 100644
--- a/lib32-audiofile/PKGBUILD
+++ b/lib32-audiofile/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Silicon Graphics Audio File Library (32-bit)"
 arch=('x86_64')
 url="http://www.68k.org/~michael/audiofile/"
 license=('LGPL')
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/0.2/${_pkgbasename}-${pkgver}.tar.bz2)
diff --git a/lib32-bzip2/PKGBUILD b/lib32-bzip2/PKGBUILD
index 8b57054..edd8948 100644
--- a/lib32-bzip2/PKGBUILD
+++ b/lib32-bzip2/PKGBUILD
@@ -6,7 +6,7 @@ pkgdesc="A high-quality data compression program (32-bit)"
 arch=('x86_64')
 license=('custom')
 url="http://sources.redhat.com/bzip2"
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib')
 source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz)
 md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b')
diff --git a/lib32-curl/PKGBUILD b/lib32-curl/PKGBUILD
index 3f153bf..431022e 100644
--- a/lib32-curl/PKGBUILD
+++ b/lib32-curl/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="An URL retrieval utility and library (32-bit)"
 arch=('x86_64')
 url="http://curl.haxx.se"
 license=('MIT')
-depends=('lib32-zlib' 'lib32-openssl' 'bash' 'ca-certificates' $_pkgbasename)
+depends=('lib32-zlib' 'lib32-openssl' 'bash' 'ca-certificates' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=("http://curl.haxx.se/download/${_pkgbasename}-${pkgver}.tar.bz2")
diff --git a/lib32-db/PKGBUILD b/lib32-db/PKGBUILD
index f93a46f..74fcfef 100644
--- a/lib32-db/PKGBUILD
+++ b/lib32-db/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="The Berkeley DB embedded database system (32-bit)"
 arch=('x86_64')
 url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
 license=('custom')
-depends=('lib32-gcc-libs' $_pkgbasename)
+depends=('lib32-gcc-libs' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib')
 options=('!libtool' 'force')
 source=(http://download-uk.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
diff --git a/lib32-e2fsprogs/PKGBUILD b/lib32-e2fsprogs/PKGBUILD
index 92282ca..ec7375f 100644
--- a/lib32-e2fsprogs/PKGBUILD
+++ b/lib32-e2fsprogs/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Ext2 filesystem libraries (32-bit)"
 arch=(x86_64)
 license=('GPL' 'LGPL' 'MIT')
 url="http://e2fsprogs.sourceforge.net"
-depends=('lib32-util-linux-ng>=2.16' $_pkgbasename)
+depends=('lib32-util-linux-ng>=2.16' $_pkgbasename=$pkgver)
 makedepends=('bc' 'gcc-multilib')
 source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz"
 		"makefile.in.patch")
diff --git a/lib32-flac/PKGBUILD b/lib32-flac/PKGBUILD
index b824c17..156e4e5 100644
--- a/lib32-flac/PKGBUILD
+++ b/lib32-flac/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Free Lossless Audio Codec (32-bit)"
 arch=('x86_64')
 url="http://flac.sourceforge.net/"
 license=('custom:Xiph' 'LGPL' 'GPL' 'FDL')
-depends=('lib32-libogg' 'lib32-gcc-libs' $_pkgbasename)
+depends=('lib32-libogg' 'lib32-gcc-libs' $_pkgbasename=$pkgver)
 makedepends=('nasm' gcc-multilib)
 options=('!libtool' '!makeflags')
 source=(http://downloads.sf.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz
diff --git a/lib32-fontconfig/PKGBUILD b/lib32-fontconfig/PKGBUILD
index 9df4bdb..e846ada 100644
--- a/lib32-fontconfig/PKGBUILD
+++ b/lib32-fontconfig/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="A library for configuring and customizing font access (32-bit)"
 arch=(x86_64)
 url="http://www.fontconfig.org/release/"
 license=('custom')
-depends=('lib32-expat>=2.0.1' 'lib32-freetype2>=2.3.11' $_pkgbasename 'lib32-bzip2')
+depends=('lib32-expat>=2.0.1' 'lib32-freetype2>=2.3.11' $_pkgbasename=$pkgver 'lib32-bzip2')
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.gz
diff --git a/lib32-freetype2-ubuntu/PKGBUILD b/lib32-freetype2-ubuntu/PKGBUILD
index f0defad..f2436b1 100644
--- a/lib32-freetype2-ubuntu/PKGBUILD
+++ b/lib32-freetype2-ubuntu/PKGBUILD
@@ -12,7 +12,7 @@ pkgdesc="TrueType font rendering library (32-bit) with infinality patch"
 arch=(x86_64)
 license=('GPL')
 url="http://freetype.sourceforge.net"
-depends=('lib32-zlib' $_pkgbasename)
+depends=('lib32-zlib' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 conflicts=('lib32-freetype2')
 provides=("lib32-freetype2=$pkgver")
diff --git a/lib32-freetype2/PKGBUILD b/lib32-freetype2/PKGBUILD
index 4268fe4..438bda4 100644
--- a/lib32-freetype2/PKGBUILD
+++ b/lib32-freetype2/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="TrueType font rendering library (32-bit)"
 arch=(x86_64)
 license=('GPL')
 url="http://freetype.sourceforge.net"
-depends=('lib32-zlib' 'lib32-bzip2' $_pkgbasename)
+depends=('lib32-zlib' 'lib32-bzip2' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
diff --git a/lib32-giflib/PKGBUILD b/lib32-giflib/PKGBUILD
index 7243c86..580fe34 100644
--- a/lib32-giflib/PKGBUILD
+++ b/lib32-giflib/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="A library for reading and writing gif images (32-bit)"
 url="http://sourceforge.net/projects/giflib/"
 arch=('x86_64')
 license=('MIT')
-depends=('lib32-libx11' 'lib32-libsm' $_pkgbasename)
+depends=('lib32-libx11' 'lib32-libsm' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 provides=("lib32-libungif=${pkgver}")
 conflicts=('lib32-libungif')
diff --git a/lib32-jack/PKGBUILD b/lib32-jack/PKGBUILD
index 00840db..d6f3663 100644
--- a/lib32-jack/PKGBUILD
+++ b/lib32-jack/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=1
 pkgdesc="A low-latency audio server (32-bit)"
 arch=('x86_64')
 license=('GPL' 'LGPL')
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 url="http://jackaudio.org/"
 options=('!libtool')
diff --git a/lib32-keyutils/PKGBUILD b/lib32-keyutils/PKGBUILD
index 550258b..ca7bef8 100644
--- a/lib32-keyutils/PKGBUILD
+++ b/lib32-keyutils/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Linux Key Management Utilities (32-bit)"
 arch=(x86_64)
 url="http://www.kernel.org"
 license=('GPL2' 'LGPL2.1')
-depends=(lib32-glibc $_pkgbasename)
+depends=(lib32-glibc $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 source=(http://people.redhat.com/~dhowells/$_pkgbasename/$_pkgbasename-$pkgver.tar.bz2)
 md5sums=('e168c1bdaf5aa93c2cbf8a5e7f8ef27b')
diff --git a/lib32-krb5/PKGBUILD b/lib32-krb5/PKGBUILD
index cd20e11..b77bda3 100644
--- a/lib32-krb5/PKGBUILD
+++ b/lib32-krb5/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="The Kerberos network authentication system (32-bit)"
 arch=('x86_64')
 url="http://web.mit.edu/kerberos/"
 license=('custom')
-depends=('lib32-e2fsprogs' 'lib32-libldap' lib32-keyutils $_pkgbasename)
+depends=('lib32-e2fsprogs' 'lib32-libldap' lib32-keyutils $_pkgbasename=$pkgver)
 makedepends=('perl' gcc-multilib)
 provides=('lib32-heimdal')
 replaces=('lib32-heimdal')
diff --git a/lib32-lcms/PKGBUILD b/lib32-lcms/PKGBUILD
index cb259a1..db55619 100644
--- a/lib32-lcms/PKGBUILD
+++ b/lib32-lcms/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="Lightweight color management development library/engine (32-bit)"
 arch=(x86_64)
 license=('custom')
-depends=('lib32-libtiff>=3.9.4' $_pkgbasename)
+depends=('lib32-libtiff>=3.9.4' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 url="http://www.littlecms.com"
 options=('!libtool')
diff --git a/lib32-libasyncns/PKGBUILD b/lib32-libasyncns/PKGBUILD
index 7a24b29..909a8cb 100644
--- a/lib32-libasyncns/PKGBUILD
+++ b/lib32-libasyncns/PKGBUILD
@@ -12,7 +12,7 @@ arch=(x86_64)
 url="http://0pointer.de/lennart/projects/libasyncns"
 license=('LGPL')
 options=('!libtool')
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib')
 source=(http://0pointer.de/lennart/projects/libasyncns/${_pkgbasename}-${pkgver}.tar.gz)
 md5sums=('1f553d6ce1ad255bc83b3d8e9384f515')
diff --git a/lib32-libcap/PKGBUILD b/lib32-libcap/PKGBUILD
index 3160e22..596e432 100644
--- a/lib32-libcap/PKGBUILD
+++ b/lib32-libcap/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="POSIX 1003.1e capabilities (32-bit)"
 arch=(x86_64)
 url="http://www.kernel.org/pub/linux/libs/security/linux-privs/"
 license=('GPL')
-depends=('lib32-attr' $_pkgbasename)
+depends=('lib32-attr' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib')
 #source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${_pkgbasename}-${pkgver}.tar.gz)
 source=(ftp://ftp.archlinux.org/other/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz)
diff --git a/lib32-libcups/PKGBUILD b/lib32-libcups/PKGBUILD
index 961f8d1..db33b83 100644
--- a/lib32-libcups/PKGBUILD
+++ b/lib32-libcups/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="The CUPS Printing System - client libraries (32-bit)"
 arch=('x86_64')
 license=('GPL')
 url="http://www.cups.org/"
-depends=(lib32-glibc $_pkgbasename)
+depends=(lib32-glibc $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib cups lib32-libusb)
 source=(http://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2)
 md5sums=('87ade07e3d1efd03c9c3add949cf9c00')
diff --git a/lib32-libdrm/PKGBUILD b/lib32-libdrm/PKGBUILD
index 74f1424..c66f385 100644
--- a/lib32-libdrm/PKGBUILD
+++ b/lib32-libdrm/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services (32-bit)"
 arch=(x86_64)
 license=('custom')
-depends=('lib32-libpciaccess' 'lib32-glibc' 'lib32-cairo' $_pkgbasename)
+depends=('lib32-libpciaccess' 'lib32-glibc' 'lib32-cairo' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=('!libtool')
 url="http://dri.freedesktop.org/"
diff --git a/lib32-libgcrypt/PKGBUILD b/lib32-libgcrypt/PKGBUILD
index 4a9bea2..4adc8fd 100644
--- a/lib32-libgcrypt/PKGBUILD
+++ b/lib32-libgcrypt/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="a general purpose crypto library based on the code used (32-bit)"
 arch=(x86_64)
 url="http://www.gnupg.org"
 license=('LGPL')
-depends=('lib32-libgpg-error>=1.7' $_pkgbasename)
+depends=('lib32-libgpg-error>=1.7' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib libtool-multilib)
 options=(!libtool)
 source=(ftp://ftp.gnupg.org/gcrypt/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
diff --git a/lib32-libgpg-error/PKGBUILD b/lib32-libgpg-error/PKGBUILD
index ba70900..61ef89e 100644
--- a/lib32-libgpg-error/PKGBUILD
+++ b/lib32-libgpg-error/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Support library for libgcrypt (32-bit)"
 arch=(x86_64)
 url="http://www.gnupg.org"
 license=('LGPL')
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=(!libtool)
 source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${_pkgbasename}-${pkgver}.tar.bz2)
diff --git a/lib32-libice/PKGBUILD b/lib32-libice/PKGBUILD
index 316bcca..c96d01b 100644
--- a/lib32-libice/PKGBUILD
+++ b/lib32-libice/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="X11 Inter-Client Exchange library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('lib32-glibc' 'xproto>=7.0.18' $_pkgbasename)
+depends=('lib32-glibc' 'xproto>=7.0.18' $_pkgbasename=$pkgver)
 makedepends=('pkgconfig' 'xtrans>=1.2.5' 'gcc-multilib')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.bz2)
diff --git a/lib32-libjpeg/PKGBUILD b/lib32-libjpeg/PKGBUILD
index ee1a6f8..cf2988d 100644
--- a/lib32-libjpeg/PKGBUILD
+++ b/lib32-libjpeg/PKGBUILD
@@ -12,7 +12,7 @@ pkgdesc="Library of JPEG support functions (32-bit)"
 arch=('x86_64')
 url="http://www.ijg.org/"
 license=('custom')
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=('libtool' 'gcc-multilib')
 options=('!libtool')
 source=(http://www.ijg.org/files/jpegsrc.v${_pkgver}.tar.gz)
diff --git a/lib32-libldap/PKGBUILD b/lib32-libldap/PKGBUILD
index 7534c1f..a2619d7 100644
--- a/lib32-libldap/PKGBUILD
+++ b/lib32-libldap/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries (32-bit)"
 arch=('x86_64')
 license=('custom')
 url="http://www.openldap.org/"
-depends=('lib32-openssl' $_pkgbasename)
+depends=('lib32-openssl' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz"
diff --git a/lib32-libmng/PKGBUILD b/lib32-libmng/PKGBUILD
index 201b2bc..b15c0b5 100644
--- a/lib32-libmng/PKGBUILD
+++ b/lib32-libmng/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="A collection of routines used to create and manipulate MNG format graph
 arch=('x86_64')
 url="http://www.libmng.com/"
 license=('custom')
-depends=('lib32-zlib' 'lib32-libjpeg>=8' $_pkgbasename)
+depends=('lib32-zlib' 'lib32-libjpeg>=8' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=(!libtool)
 source=(http://downloads.sourceforge.net/sourceforge/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz)
diff --git a/lib32-libogg/PKGBUILD b/lib32-libogg/PKGBUILD
index 16a3792..ebb8eb3 100644
--- a/lib32-libogg/PKGBUILD
+++ b/lib32-libogg/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Ogg bitstream and framing library (32-bit)"
 arch=('x86_64')
 url="http://www.xiph.org/ogg/"
 license=('BSD')
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=(http://downloads.xiph.org/releases/ogg/$_pkgbasename-$pkgver.tar.gz)
diff --git a/lib32-libpng/PKGBUILD b/lib32-libpng/PKGBUILD
index eb84693..1f4a335 100644
--- a/lib32-libpng/PKGBUILD
+++ b/lib32-libpng/PKGBUILD
@@ -12,7 +12,7 @@ pkgdesc="A collection of routines used to create PNG format graphics files (32-b
 arch=('x86_64')
 url="http://www.libpng.org/pub/png/libpng.html"
 license=('custom')
-depends=('lib32-zlib' $_pkgbasename)
+depends=('lib32-zlib' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz"
diff --git a/lib32-libsamplerate/PKGBUILD b/lib32-libsamplerate/PKGBUILD
index d13c62d..72c2b94 100644
--- a/lib32-libsamplerate/PKGBUILD
+++ b/lib32-libsamplerate/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio (32-bit)"
 arch=('x86_64')
 url="http://www.mega-nerd.com/SRC/index.html"
 license=('GPL')
-depends=('lib32-libsndfile' $_pkgbasename)
+depends=('lib32-libsndfile' $_pkgbasename=$pkgver)
 makedepedns=('gcc-multilib')
 options=('!libtool')
 source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz)
diff --git a/lib32-libsm/PKGBUILD b/lib32-libsm/PKGBUILD
index e7e8f33..6b3697e 100644
--- a/lib32-libsm/PKGBUILD
+++ b/lib32-libsm/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 Session Management library (32-bit)"
 arch=(x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('lib32-libice' 'lib32-util-linux-ng' $_pkgbasename)
+depends=('lib32-libice' 'lib32-util-linux-ng' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' 'xtrans' 'gcc-multilib')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libSM-${pkgver}.tar.bz2)
diff --git a/lib32-libsndfile/PKGBUILD b/lib32-libsndfile/PKGBUILD
index 147ffc9..0caf8a2 100644
--- a/lib32-libsndfile/PKGBUILD
+++ b/lib32-libsndfile/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="A C library for reading and writing files containing sampled sound (32-
 arch=('x86_64')
 url="http://www.mega-nerd.com/libsndfile"
 license=('LGPL')
-depends=('lib32-flac' 'lib32-libvorbis' $_pkgbasename)
+depends=('lib32-flac' 'lib32-libvorbis' $_pkgbasename=$pkgver)
 makedepends=('lib32-alsa-lib' 'gcc-multilib')
 options=('!libtool')
 source=(http://www.mega-nerd.com/libsndfile/files/${_pkgbasename}-${pkgver}.tar.gz)
diff --git a/lib32-libtiff/PKGBUILD b/lib32-libtiff/PKGBUILD
index 8d02c2c..1c39efb 100644
--- a/lib32-libtiff/PKGBUILD
+++ b/lib32-libtiff/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Library for manipulation of TIFF images (32-bit)"
 arch=('x86_64')
 url="http://www.remotesensing.org/libtiff/"
 license=('custom')
-depends=('lib32-libjpeg' 'lib32-zlib' $_pkgbasename)
+depends=('lib32-libjpeg' 'lib32-zlib' $_pkgbasename=$pkgver)
 makedepends=('lib32-libgl' 'lib32-libxmu' 'lib32-libxi' gcc-multilib)
 options=('!libtool')
 source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz \
diff --git a/lib32-libvisual/PKGBUILD b/lib32-libvisual/PKGBUILD
index b7240a8..023fbf1 100644
--- a/lib32-libvisual/PKGBUILD
+++ b/lib32-libvisual/PKGBUILD
@@ -13,7 +13,7 @@ pkgdesc="Abstraction library that comes between applications and audio visualisa
 arch=('x86_64')
 url="http://sourceforge.net/projects/libvisual/"
 license=('LGPL')
-depends=('lib32-glibc' "$_pkgbasename")
+depends=('lib32-glibc' "$_pkgbasename=$pkgver")
 makedepends=('gcc-multilib')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-${pkgver}.tar.gz")
diff --git a/lib32-libvorbis/PKGBUILD b/lib32-libvorbis/PKGBUILD
index 80b0114..fc608ec 100644
--- a/lib32-libvorbis/PKGBUILD
+++ b/lib32-libvorbis/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Vorbis codec library (32-bit)"
 arch=('x86_64')
 license=('custom')
 url="http://www.xiph.org/ogg/vorbis/"
-depends=('lib32-libogg' $_pkgbasename)
+depends=('lib32-libogg' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=(http://downloads.xiph.org/releases/vorbis/${_pkgbasename}-${pkgver}.tar.gz)
diff --git a/lib32-libx11/PKGBUILD b/lib32-libx11/PKGBUILD
index ae633c6..f3e0711 100644
--- a/lib32-libx11/PKGBUILD
+++ b/lib32-libx11/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="X11 client-side library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('lib32-libxcb' 'xproto' 'kbproto' $_pkgbasename)
+depends=('lib32-libxcb' 'xproto' 'kbproto' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto' 'gcc-multilib')
 options=('!libtool')
 license=('custom:XFREE86')
diff --git a/lib32-libxau/PKGBUILD b/lib32-libxau/PKGBUILD
index 6fbaeff..02698ac 100644
--- a/lib32-libxau/PKGBUILD
+++ b/lib32-libxau/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="X11 authorisation library"
 url="http://xorg.freedesktop.org/"
 arch=(x86_64)
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=('pkgconfig' 'xproto' 'gcc-multilib')
 license=('custom')
 options=('!libtool')
diff --git a/lib32-libxaw/PKGBUILD b/lib32-libxaw/PKGBUILD
index 1c0bf9f..267233c 100644
--- a/lib32-libxaw/PKGBUILD
+++ b/lib32-libxaw/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 Athena Widget library (32 bit)"
 arch=('x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('lib32-libxmu' 'lib32-libxpm' "$_pkgbasename>=$pkgver")
+depends=('lib32-libxmu' 'lib32-libxpm' "$_pkgbasename=$pkgver>=$pkgver")
 makedepends=('xorg-util-macros' 'gcc-multilib')
 options=('!libtool')
 source=(http://xorg.freedesktop.org/releases/individual/lib/libXaw-${pkgver}.tar.bz2)
diff --git a/lib32-libxcomposite/PKGBUILD b/lib32-libxcomposite/PKGBUILD
index 5c03575..998033a 100644
--- a/lib32-libxcomposite/PKGBUILD
+++ b/lib32-libxcomposite/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 Composite extension library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('lib32-libxfixes' 'lib32-libxext' 'compositeproto' $_pkgbasename)
+depends=('lib32-libxfixes' 'lib32-libxext' 'compositeproto' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' gcc-multilib)
 options=(!libtool)
 source=(${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2)
diff --git a/lib32-libxcursor/PKGBUILD b/lib32-libxcursor/PKGBUILD
index e1bf1f0..6d9e5c6 100644
--- a/lib32-libxcursor/PKGBUILD
+++ b/lib32-libxcursor/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X cursor management library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('lib32-libxfixes' 'lib32-libxrender' $_pkgbasename)
+depends=('lib32-libxfixes' 'lib32-libxrender' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' gcc-multilib)
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2)
diff --git a/lib32-libxdamage/PKGBUILD b/lib32-libxdamage/PKGBUILD
index 584b6da..f69b739 100644
--- a/lib32-libxdamage/PKGBUILD
+++ b/lib32-libxdamage/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 damaged region extension library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('lib32-libxfixes>=4.0.4' $_pkgbasename)
+depends=('lib32-libxfixes>=4.0.4' $_pkgbasename=$pkgver)
 makedepends=('pkg-config' 'damageproto>=1.2.0' gcc-multilib)
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXdamage-${pkgver}.tar.bz2)
diff --git a/lib32-libxdmcp/PKGBUILD b/lib32-libxdmcp/PKGBUILD
index f912b70..0c80d2d 100644
--- a/lib32-libxdmcp/PKGBUILD
+++ b/lib32-libxdmcp/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 Display Manager Control Protocol library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('xproto' 'lib32-glibc' $_pkgbasename)
+depends=('xproto' 'lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' 'gcc-multilib')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2)
diff --git a/lib32-libxext/PKGBUILD b/lib32-libxext/PKGBUILD
index 575f807..b33fe28 100644
--- a/lib32-libxext/PKGBUILD
+++ b/lib32-libxext/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 miscellaneous extensions library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('lib32-libx11' 'xextproto' $_pkgbasename)
+depends=('lib32-libx11' 'xextproto' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' 'gcc-multilib')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2)
diff --git a/lib32-libxfixes/PKGBUILD b/lib32-libxfixes/PKGBUILD
index bfcbe47..2d891cc 100644
--- a/lib32-libxfixes/PKGBUILD
+++ b/lib32-libxfixes/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 miscellaneous 'fixes' extension library (32-bit)"
 arch=('x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('lib32-libx11>=1.3.3' $_pkgbasename)
+depends=('lib32-libx11>=1.3.3' $_pkgbasename=$pkgver)
 makedepends=('pkg-config' 'gcc-multilib' "fixesproto>=4.1.1")
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2)
diff --git a/lib32-libxi/PKGBUILD b/lib32-libxi/PKGBUILD
index b06c8bc..0322bf9 100644
--- a/lib32-libxi/PKGBUILD
+++ b/lib32-libxi/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="X11 Input extension library (32-bit)"
 arch=('x86_64')
 url="http://xorg.freedesktop.org"
-depends=('lib32-libxext' 'inputproto' $_pkgbasename)
+depends=('lib32-libxext' 'inputproto' $_pkgbasename=$pkgver)
 makedepends=('pkgconfig' 'xorg-util-macros' gcc-multilib)
 options=(!libtool)
 license=('custom')
diff --git a/lib32-libxinerama/PKGBUILD b/lib32-libxinerama/PKGBUILD
index 0b9e609..cd67c8b 100644
--- a/lib32-libxinerama/PKGBUILD
+++ b/lib32-libxinerama/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 Xinerama extension library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('lib32-libxext' 'xineramaproto' $_pkgbasename)
+depends=('lib32-libxext' 'xineramaproto' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' gcc-multilib)
 options=(!libtool)
 source=(${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2)
diff --git a/lib32-libxml2/PKGBUILD b/lib32-libxml2/PKGBUILD
index def1898..c372dc2 100644
--- a/lib32-libxml2/PKGBUILD
+++ b/lib32-libxml2/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=2
 pkgdesc="XML parsing library, version 2 (32-bit)"
 arch=(x86_64)
 license=('custom')
-depends=('lib32-zlib>=1.2.4' 'lib32-readline>=6.1' 'lib32-ncurses>=5.7' $_pkgbasename)
+depends=('lib32-zlib>=1.2.4' 'lib32-readline>=6.1' 'lib32-ncurses>=5.7' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=('!libtool')
 url="http://www.xmlsoft.org/"
diff --git a/lib32-libxmu/PKGBUILD b/lib32-libxmu/PKGBUILD
index c151591..4668d06 100644
--- a/lib32-libxmu/PKGBUILD
+++ b/lib32-libxmu/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="X11 miscellaneous micro-utility library (32-bit)"
 arch=('x86_64')
 url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' 'lib32-libxt' $_pkgbasename)
+depends=('lib32-libxext' 'lib32-libxt' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' 'gcc-multilib')
 license=('custom')
 options=('!libtool')
diff --git a/lib32-libxpm/PKGBUILD b/lib32-libxpm/PKGBUILD
index f332f4d..2f001f7 100644
--- a/lib32-libxpm/PKGBUILD
+++ b/lib32-libxpm/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 pixmap library (32-bit)"
 arch=(x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('lib32-libxt' 'lib32-libxext' $_pkgbasename)
+depends=('lib32-libxt' 'lib32-libxext' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' gcc-multilib)
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2)
diff --git a/lib32-libxrandr/PKGBUILD b/lib32-libxrandr/PKGBUILD
index 01bd324..2798013 100644
--- a/lib32-libxrandr/PKGBUILD
+++ b/lib32-libxrandr/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 RandR extension library (32-bit)"
 arch=('x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' 'lib32-libxrender' 'randrproto' $_pkgbasename)
+depends=('lib32-libxext' 'lib32-libxrender' 'randrproto' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' gcc-multilib)
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2)
diff --git a/lib32-libxrender/PKGBUILD b/lib32-libxrender/PKGBUILD
index 68dcb2d..208b6e1 100644
--- a/lib32-libxrender/PKGBUILD
+++ b/lib32-libxrender/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X Rendering Extension client library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('lib32-libx11>=1.3.3' $_pkgbasename)
+depends=('lib32-libx11>=1.3.3' $_pkgbasename=$pkgver)
 makedepends=('pkgconfig' 'gcc-multilib' renderproto)
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXrender-${pkgver}.tar.bz2)
diff --git a/lib32-libxslt/PKGBUILD b/lib32-libxslt/PKGBUILD
index 2634902..129adab 100644
--- a/lib32-libxslt/PKGBUILD
+++ b/lib32-libxslt/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="XML stylesheet transformation library (32-bit)"
 arch=('x86_64')
 url="http://xmlsoft.org/XSLT/"
 license=('custom')
-depends=('lib32-libxml2>=2.7.7' 'lib32-libgcrypt>=1.4.4' $_pkgbasename)
+depends=('lib32-libxml2>=2.7.7' 'lib32-libgcrypt>=1.4.4' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=(ftp://xmlsoft.org/libxslt/${_pkgbasename}-${pkgver}.tar.gz)
diff --git a/lib32-libxss/PKGBUILD b/lib32-libxss/PKGBUILD
index 4469c5a..447b3d0 100644
--- a/lib32-libxss/PKGBUILD
+++ b/lib32-libxss/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 Screen Saver extension library (32-bit)"
 arch=(x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' 'scrnsaverproto' $_pkgbasename)
+depends=('lib32-libxext' 'scrnsaverproto' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' gcc-multilib)
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2)
diff --git a/lib32-libxt/PKGBUILD b/lib32-libxt/PKGBUILD
index 5fe514d..98e5be1 100644
--- a/lib32-libxt/PKGBUILD
+++ b/lib32-libxt/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 toolkit intrinsics library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('lib32-libsm' 'lib32-libx11' $_pkgbasename)
+depends=('lib32-libsm' 'lib32-libx11' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' 'gcc-multilib')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2)
diff --git a/lib32-libxtst/PKGBUILD b/lib32-libxtst/PKGBUILD
index c93163e..a3b4e41 100644
--- a/lib32-libxtst/PKGBUILD
+++ b/lib32-libxtst/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 Testing -- Resource extension library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('lib32-libxext' 'lib32-libxi' 'recordproto' 'inputproto' $_pkgbasename)
+depends=('lib32-libxext' 'lib32-libxi' 'recordproto' 'inputproto' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib' 'xorg-util-macros')
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2)
diff --git a/lib32-libxv/PKGBUILD b/lib32-libxv/PKGBUILD
index 0f425b2..9738385 100644
--- a/lib32-libxv/PKGBUILD
+++ b/lib32-libxv/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 Video extension library (32-bit)"
 arch=(x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' 'videoproto' $_pkgbasename)
+depends=('lib32-libxext' 'videoproto' $_pkgbasename=$pkgver)
 makedepends=('pkgconfig' gcc-multilib)
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2)
diff --git a/lib32-libxvmc/PKGBUILD b/lib32-libxvmc/PKGBUILD
index 7f08104..d4c350d 100644
--- a/lib32-libxvmc/PKGBUILD
+++ b/lib32-libxvmc/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 Video Motion Compensation extension library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('lib32-libxv>=1.0.5' $_pkgbasename)
+depends=('lib32-libxv>=1.0.5' $_pkgbasename=$pkgver)
 makedepends=('pkgconfig' gcc-multilib)
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXvMC-${pkgver}.tar.bz2)
diff --git a/lib32-libxxf86dga/PKGBUILD b/lib32-libxxf86dga/PKGBUILD
index 6af6060..be24fc0 100644
--- a/lib32-libxxf86dga/PKGBUILD
+++ b/lib32-libxxf86dga/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 Direct Graphics Access extension library (32-bit)"
 arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('lib32-libxext' 'xf86dgaproto' $_pkgbasename)
+depends=('lib32-libxext' 'xf86dgaproto' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' gcc-multilib)
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXxf86dga-${pkgver}.tar.bz2)
diff --git a/lib32-libxxf86vm/PKGBUILD b/lib32-libxxf86vm/PKGBUILD
index d0bc4e4..d2c5b42 100644
--- a/lib32-libxxf86vm/PKGBUILD
+++ b/lib32-libxxf86vm/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="X11 XFree86 video mode extension library (32-bit)"
 arch=('x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' 'xf86vidmodeproto' $_pkgbasename)
+depends=('lib32-libxext' 'xf86vidmodeproto' $_pkgbasename=$pkgver)
 makedepends=('xorg-util-macros' gcc-multilib)
 options=('!libtool')
 source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2)
diff --git a/lib32-mpg123/PKGBUILD b/lib32-mpg123/PKGBUILD
index 4055d80..98877ec 100644
--- a/lib32-mpg123/PKGBUILD
+++ b/lib32-mpg123/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3 (32-bi
 arch=('x86_64')
 url="http://sourceforge.net/projects/mpg123"
 license=('GPL2' 'LGPL2.1')
-depends=('lib32-glibc' 'lib32-libtool' 'lib32-alsa-lib' "$_pkgbasename=${pkgver}")
+depends=('lib32-glibc' 'lib32-libtool' 'lib32-alsa-lib' "$_pkgbasename=$pkgver=${pkgver}")
 makedepends=('lib32-sdl' gcc-multilib libtool-multilib)
 optdepends=('lib32-sdl: for additional audio support')
 options=('libtool')
diff --git a/lib32-nspr/PKGBUILD b/lib32-nspr/PKGBUILD
index 5b93231..82969d0 100644
--- a/lib32-nspr/PKGBUILD
+++ b/lib32-nspr/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Netscape Portable Runtime (32-bit)"
 arch=('x86_64')
 url="http://www.mozilla.org/projects/nspr/"
 license=('MPL' 'GPL')
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=('zip' 'gcc-multilib')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_pkgbasename}-${pkgver}.tar.gz
diff --git a/lib32-nss/PKGBUILD b/lib32-nss/PKGBUILD
index 2460b7f..42fbac3 100644
--- a/lib32-nss/PKGBUILD
+++ b/lib32-nss/PKGBUILD
@@ -12,7 +12,7 @@ arch=('x86_64')
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
 _nsprver=4.9
-depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite3>=3.6.17' "$_pkgbasename" 'lib32-zlib')
+depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite3>=3.6.17' "$_pkgbasename=$pkgver" 'lib32-zlib')
 makedepends=('gcc-multilib' 'perl')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
         nss-no-rpath.patch
diff --git a/lib32-nvidia-utils-bumblebee/PKGBUILD b/lib32-nvidia-utils-bumblebee/PKGBUILD
index a4ec7cf..c5afd22 100644
--- a/lib32-nvidia-utils-bumblebee/PKGBUILD
+++ b/lib32-nvidia-utils-bumblebee/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="NVIDIA drivers utilities and libraries (32-bit). Repacked and installed in away that won't break LibGL from mesa."
 arch=('x86_64')
 url="http://www.nvidia.com/"
-depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' $_pkgbasename)
+depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' $_pkgbasename=$pkgver)
 conflicts=('lib32-nvidia-utils')
 provides=("lib32-nvidia-utils=${pkgver}")
 license=('custom')
diff --git a/lib32-nvidia-utils/PKGBUILD b/lib32-nvidia-utils/PKGBUILD
index 0c376a5..76d4dbf 100644
--- a/lib32-nvidia-utils/PKGBUILD
+++ b/lib32-nvidia-utils/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="NVIDIA drivers utilities and libraries. (32-bit)"
 arch=('x86_64')
 url="http://www.nvidia.com/"
-depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' $_pkgbasename=$pkgver)
+depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' $_pkgbasename=$pkgver=$pkgver)
 conflicts=('lib32-libgl')
 provides=('lib32-libgl=7.11')
 license=('custom')
diff --git a/lib32-openal/PKGBUILD b/lib32-openal/PKGBUILD
index bccf2da..b43aa35 100644
--- a/lib32-openal/PKGBUILD
+++ b/lib32-openal/PKGBUILD
@@ -13,7 +13,7 @@ pkgdesc="OpenAL audio library for use with opengl (32-bit)"
 arch=('x86_64')
 url="http://www.openal.org/"
 license=('LGPL')
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=('lib32-alsa-lib' 'lib32-sdl' 'lib32-libpulse' 'pkgconfig' 'cmake' gcc-multilib)
 options=('!libtool')
 source=(http://kcat.strangesoft.net/openal-releases/openal-soft-${pkgver}.tar.bz2)
diff --git a/lib32-openssl/PKGBUILD b/lib32-openssl/PKGBUILD
index a4b05b1..5201f1a 100644
--- a/lib32-openssl/PKGBUILD
+++ b/lib32-openssl/PKGBUILD
@@ -13,7 +13,7 @@ pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Se
 arch=('x86_64')
 url='https://www.openssl.org'
 license=('custom:BSD')
-depends=(lib32-zlib $_pkgbasename)
+depends=(lib32-zlib $_pkgbasename=$pkgver)
 optdepends=('ca-certificates' perl gcc-multilib)
 options=('!makeflags')
 source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"
diff --git a/lib32-pcre/PKGBUILD b/lib32-pcre/PKGBUILD
index 8f2d6c1..7205136 100644
--- a/lib32-pcre/PKGBUILD
+++ b/lib32-pcre/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="A library that implements Perl 5-style regular expressions (32-bit)"
 arch=('x86_64')
 url="http://pcre.sourceforge.net"
 license=('custom')
-depends=('lib32-gcc-libs' $_pkgbasename)
+depends=('lib32-gcc-libs' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib')
 options=('!libtool')
 source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2)
diff --git a/lib32-pixman/PKGBUILD b/lib32-pixman/PKGBUILD
index 823eded..f05bcb4 100644
--- a/lib32-pixman/PKGBUILD
+++ b/lib32-pixman/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Pixman library (32-bit)"
 arch=('x86_64')
 url="http://xorg.freedesktop.org"
 license=('custom')
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib')
 options=('!libtool')
 source=(http://xorg.freedesktop.org/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2)
diff --git a/lib32-readline/PKGBUILD b/lib32-readline/PKGBUILD
index 5bca458..6fff4e0 100644
--- a/lib32-readline/PKGBUILD
+++ b/lib32-readline/PKGBUILD
@@ -12,7 +12,7 @@ pkgdesc="GNU readline library (32-bit)"
 arch=(x86_64)
 url="http://tiswww.case.edu/php/chet/readline/rltop.html"
 license=('GPL')
-depends=('lib32-glibc' 'lib32-ncurses' $_pkgbasename)
+depends=('lib32-glibc' 'lib32-ncurses' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib')
 source=(http://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz)
 if [ $_patchlevel -gt 00 ]; then
diff --git a/lib32-sdl/PKGBUILD b/lib32-sdl/PKGBUILD
index 0f70b35..c87c800 100644
--- a/lib32-sdl/PKGBUILD
+++ b/lib32-sdl/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="A library for portable low-level access to a video framebuffer, audio o
 arch=('x86_64')
 url="http://www.libsdl.org"
 license=('LGPL')
-depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename)
+depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename=$pkgver)
 makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib)
 options=('!libtool')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
diff --git a/lib32-sdl_image/PKGBUILD b/lib32-sdl_image/PKGBUILD
index 6e82a77..064f765 100644
--- a/lib32-sdl_image/PKGBUILD
+++ b/lib32-sdl_image/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="A simple library to load images of various formats as SDL surfaces (32-
 arch=('x86_64')
 url="http://www.libsdl.org/projects/SDL_image/"
 license=('LGPL')
-depends=('lib32-sdl' 'lib32-libpng' 'lib32-libjpeg' 'lib32-libtiff' 'lib32-zlib' "$_pkgbasename")
+depends=('lib32-sdl' 'lib32-libpng' 'lib32-libjpeg' 'lib32-libtiff' 'lib32-zlib' "$_pkgbasename=$pkgver")
 makedepends=('gcc-multilib')
 options=('!libtool')
 source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz)
diff --git a/lib32-sdl_mixer/PKGBUILD b/lib32-sdl_mixer/PKGBUILD
index d0f0aad..cb173ac 100644
--- a/lib32-sdl_mixer/PKGBUILD
+++ b/lib32-sdl_mixer/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="A simple multi-channel audio mixer (32-bit)"
 arch=('x86_64')
 url="http://www.libsdl.org/projects/SDL_mixer/"
 license=('LGPL' 'GPL')
-depends=("$_pkgbasename" 'lib32-sdl>=1.2.12' 'lib32-libvorbis' 'lib32-libmikmod' 'lib32-smpeg')
+depends=("$_pkgbasename=$pkgver" 'lib32-sdl>=1.2.12' 'lib32-libvorbis' 'lib32-libmikmod' 'lib32-smpeg')
 makedepends=('gcc-multilib')
 options=('!libtool')
 source=("http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${pkgver}.tar.gz")
diff --git a/lib32-sdl_net/PKGBUILD b/lib32-sdl_net/PKGBUILD
index a1297fc..8e7045c 100644
--- a/lib32-sdl_net/PKGBUILD
+++ b/lib32-sdl_net/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="A small sample cross-platform networking library (32 bit)"
 arch=('x86_64')
 url="http://www.libsdl.org/projects/SDL_net/"
 license=('LGPL')
-depends=('lib32-sdl' $_pkgbasename)
+depends=('lib32-sdl' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib')
 options=('!libtool')
 source=(http://www.libsdl.org/projects/SDL_net/release/SDL_net-${pkgver}.tar.gz)
diff --git a/lib32-sdl_ttf/PKGBUILD b/lib32-sdl_ttf/PKGBUILD
index 41ca7d9..bda3f9c 100644
--- a/lib32-sdl_ttf/PKGBUILD
+++ b/lib32-sdl_ttf/PKGBUILD
@@ -12,7 +12,7 @@ arch=('x86_64')
 url="http://www.libsdl.org/projects/SDL_ttf/"
 license=('LGPL')
 options=('!libtool')
-depends=('lib32-sdl' 'lib32-freetype2' $_pkgbasename)
+depends=('lib32-sdl' 'lib32-freetype2' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib')
 source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz)
 md5sums=('814e6e17e8879254208d23b3b7e0354b')
diff --git a/lib32-speex/PKGBUILD b/lib32-speex/PKGBUILD
index a664d6a..8ce0e7f 100644
--- a/lib32-speex/PKGBUILD
+++ b/lib32-speex/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="A free codec for free speech (32-bit)"
 arch=(x86_64)
 license=('BSD')
-depends=('lib32-libogg' $_pkgbasename)
+depends=('lib32-libogg' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=(http://downloads.us.xiph.org/releases/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz)
diff --git a/lib32-sqlite3/PKGBUILD b/lib32-sqlite3/PKGBUILD
index 1e273b2..569e844 100644
--- a/lib32-sqlite3/PKGBUILD
+++ b/lib32-sqlite3/PKGBUILD
@@ -12,7 +12,7 @@ pkgdesc="A C library that implements an SQL database engine (32-bit)"
 arch=('x86_64')
 license=('custom')
 url="http://www.sqlite.org/"
-depends=(lib32-glibc $_pkgbasename)
+depends=(lib32-glibc $_pkgbasename=$pkgver)
 makedepends=('tcl' 'gcc-multilib' 'lib32-readline')
 source=(http://www.sqlite.org/sqlite-src-${_amalgamationver}.zip)
 options=(!libtool)
diff --git a/lib32-util-linux/PKGBUILD b/lib32-util-linux/PKGBUILD
index abe2685..1f04f2b 100644
--- a/lib32-util-linux/PKGBUILD
+++ b/lib32-util-linux/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux (32-bit)"
 url="http://userweb.kernel.org/~kzak/util-linux-ng/"
 arch=('x86_64')
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=('gcc-multilib')
 license=('GPL2')
 options=('!libtool' '!emptydirs')
diff --git a/lib32-v4l-utils/PKGBUILD b/lib32-v4l-utils/PKGBUILD
index 128cc2c..a3ab0d7 100644
--- a/lib32-v4l-utils/PKGBUILD
+++ b/lib32-v4l-utils/PKGBUILD
@@ -15,7 +15,7 @@ replaces=('lib32-libv4l')
 conflicts=('lib32-libv4l')
 license=('LGPL')
 makedepends=('gcc-multilib')
-depends=('lib32-gcc-libs' $_pkgbasename 'lib32-libjpeg-turbo')
+depends=('lib32-gcc-libs' $_pkgbasename=$pkgver 'lib32-libjpeg-turbo')
 source=(http://linuxtv.org/downloads/v4l-utils/${_pkgbasename}-${pkgver}.tar.bz2)
 sha256sums=('5fa4c6f4b6f5410de57271a03cc9a15f15195ef3fc05a8e42ecf507d6d70a87f')
 
diff --git a/lib32-xcb-util/PKGBUILD b/lib32-xcb-util/PKGBUILD
index 8e93f80..4c608c1 100644
--- a/lib32-xcb-util/PKGBUILD
+++ b/lib32-xcb-util/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Utility libraries for XC Binding (32-bit)"
 arch=('x86_64')
 url="http://xcb.freedesktop.org"
 license=('custom')
-depends=('lib32-glibc' 'lib32-libxcb' $_pkgbasename)
+depends=('lib32-glibc' 'lib32-libxcb' $_pkgbasename=$pkgver)
 makedepends=('gperf' 'gcc-multilib')
 options=('!libtool')
 source=(http://xcb.freedesktop.org/dist/${_pkgbasename}-${pkgver}.tar.bz2)
diff --git a/lib32-zlib/PKGBUILD b/lib32-zlib/PKGBUILD
index 99c1871..0cbe4ab 100644
--- a/lib32-zlib/PKGBUILD
+++ b/lib32-zlib/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc='Compression library implementing the deflate compression method found i
 arch=('x86_64')
 license=('custom')
 url="http://www.zlib.net/"
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' $_pkgbasename=$pkgver)
 makedepends=(gcc-multilib)
 options=('!makeflags')
 source=("http://zlib.net/${_pkgbasename}-${pkgver}.tar.gz")