toxcore-git: Resolved merge conflicts as requested by Gottox

common/shlibs

@@ -1960,3 +1960,7 @@ libusbredirhost.so.1 usbredir-0.7_1
 libprotobuf-c.so.1 protobuf-c-1.1.0_1
 libutf8proc.so.1 libutf8proc-1.1.6_1
 libnsutils.so.0 libnsutils-0.0.1_1
+libtoxcore.so.0 toxcore-git-20150313_1
+libtoxencryptsave.so.0 toxcore-git-20150313_1
+libtoxdns.so.0 toxcore-git-20150313_1
+libtoxav.so.0 toxcore-git-20150313_1

srcpkgs/toxcore-devel-git

@@ -0,0 +1 @@
+toxcore-git

srcpkgs/toxcore-git/template

@@ -0,0 +1,31 @@
+# Template file for 'toxcore-git'
+pkgname="toxcore-git"
+version="20150313"
+revision=1
+short_desc="Encrypted peer-to-peer instant messenger protocol library"
+maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
+license="GPL-3"
+homepage="https://tox.im"
+makedepends="libsodium-devel opus-devel libvpx-devel"
+hostmakedepends="git autoconf automake libtool pkg-config"
+build_style="gnu-configure"
+
+do_fetch() {
+	git clone https://github.com/irungentoo/toxcore.git ${wrksrc}
+}
+
+pre_configure() {
+	./autogen.sh
+}
+
+# Development package
+toxcore-devel-git_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+		vmove usr/lib/pkgconfig
+	}
+}
+