Merge git://dev.alpinelinux.org/aports

7 files changed, 237 insertions, 11 deletions

diff --git a/testing/chromium/APKBUILD b/testing/chromium/APKBUILD
index b19ee388f3..2adaf905fa 100644
--- a/testing/chromium/APKBUILD
+++ b/testing/chromium/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Unmaintained <unmaintained@alpinelinux.org>
 pkgname=chromium
-pkgver=13.0.754.0
+pkgver=17.0.942.0
 pkgrel=0
 pkgdesc="chromium web browser"
 url="http://www.chromium.org/"
@@ -12,8 +12,10 @@ depends=
 depends_dev="alsa-lib-dev libevent-dev libpng-dev jpeg-dev cairo-dev cups-dev mesa-dev
 	     dbus-glib-dev gtk+-dev libxml2-dev freetype-dev
 	     libxslt-dev libxtst-dev icu-dev flac-dev speex-dev
-	     hunspell-dev libxinerama-dev"
-makedepends="$depends_dev xdg-utils yasm gperf"
+	     hunspell-dev libxinerama-dev ffmpeg-dev nss-dev
+	     libwebp-dev v8-dev bzip2-dev libevent-dev libvpx-dev
+	     sqlite-dev"
+makedepends="$depends_dev xdg-utils yasm gperf elfutils bison flex"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://build.chromium.org/official/chromium-$pkgver.tar.bz2
@@ -36,6 +38,55 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+
+	msg "Stripping Google cruft..."
+	find third_party -type f \! -iname '*.gyp*' \
+		\! -path 'third_party/WebKit/*' \
+		\! -path 'third_party/angle/*' \
+		\! -path 'third_party/cacheinvalidation/*' \
+		\! -path 'third_party/cld/*' \
+		\! -path 'third_party/expat/*' \
+		\! -path 'third_party/ffmpeg/*' \
+		\! -path 'third_party/flac/flac.h' \
+		\! -path 'third_party/gpsd/*' \
+		\! -path 'third_party/harfbuzz/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/jsoncpp/*' \
+		\! -path 'third_party/launchpad_translations/*' \
+		\! -path 'third_party/leveldb/*' \
+		\! -path 'third_party/leveldatabase/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libvpx/*' \
+		\! -path 'third_party/lss/*' \
+		\! -path 'third_party/mesa/*' \
+		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/mongoose/*' \
+		\! -path 'third_party/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/protobuf/*' \
+		\! -path 'third_party/scons-2.0.1/*' \
+		\! -path 'third_party/sfntly/*' \
+		\! -path 'third_party/skia/*' \
+		\! -path 'third_party/smhasher/*' \
+		\! -path 'third_party/speex/speex.h' \
+		\! -path 'third_party/sqlite/*' \
+		\! -path 'third_party/tcmalloc/*' \
+		\! -path 'third_party/tlslite/*' \
+		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/v8-i18n/*' \
+		\! -path 'third_party/webdriver/*' \
+		\! -path 'third_party/webgl_conformance/*' \
+		\! -path 'third_party/webrtc/*' \
+		\! -path 'third_party/zlib/contrib/minizip/*' \
+		-delete || return 1
+
+	msg "Hacking source tree to use system V8 headers..."
+	find v8 -type f \! -iname '*.gyp*' -delete || return 1
+	rmdir v8/include || return 1
+	ln -s /usr/include v8/include || return 1
 }
 
 build() {
@@ -44,9 +95,11 @@ build() {
 	chromium_arch=ia32
 	test ${CARCH} = x86_64 && chromium_arch=x64
 
+	# enabling SSE2 causes psABI breakage.
 	msg "chromium architecture is ${chromium_arch}"
 	GYP_DEFINES="\
 		werror= \
+		disable_sse2=1 \
 		no_strict_aliasing=1 \
 		linux_sandbox_path=/usr/lib/${pkgname}/chromium-sandbox \
 		linux_sandbox_chrome_path=/usr/lib/${pkgname}/chromium \
@@ -61,7 +114,12 @@ build() {
 		use_system_yasm=1 \
 		use_system_libevent=1 \
 		use_system_icu=1 \
-		use_system_ssl=0 \
+		use_system_v8=1 \
+		use_system_libwebp=1 \
+		use_system_ffmpeg=1 \
+		use_system_vpx=1 \
+		use_system_ssl=1 \
+		use_system_sqlite=1 \
 		use_gconf=0 \
 		use_gnome_keyring=0 \
 		remoting=0 \
diff --git a/testing/luajit/APKBUILD b/testing/luajit/APKBUILD
new file mode 100644
index 0000000000..7646ed1ba3
--- /dev/null
+++ b/testing/luajit/APKBUILD
@@ -0,0 +1,32 @@
+# Contributor: Cameron Banta <cbanta@gmail.com>
+# Maintainer: Cameron Banta <cbanta@gmail.com>
+pkgname=luajit
+_pkgname=LuaJIT
+pkgver=2.0.0_beta8
+_pkgver=${pkgver//_/-}
+pkgrel=0
+pkgdesc="Just-In-Time Compiler for the Lua programming language"
+url="http://luajit.org"
+arch="all"
+license="MIT"
+depends=""
+depends_dev=""
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://luajit.org/download/$_pkgname-$_pkgver.tar.gz"
+
+_builddir=$srcdir/$_pkgname-$_pkgver
+
+build() {
+	cd "$_builddir"
+	make amalg PREFIX=/usr || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make install DESTDIR="$pkgdir" PREFIX=/usr || return 1
+	ln -sf /usr/bin/luajit-${_pkgver} $pkgdir/usr/bin/luajit
+}
+
+md5sums="f0748a73ae268d49b1d01f56c4fe3e61  LuaJIT-2.0.0-beta8.tar.gz"
diff --git a/testing/py-curl/APKBUILD b/testing/py-curl/APKBUILD
new file mode 100644
index 0000000000..3100eee0d2
--- /dev/null
+++ b/testing/py-curl/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=py-curl
+pkgver=7.19.0
+pkgrel=0
+pkgdesc="A Python interface to libcurl"
+url="http://pycurl.sourceforge.net/"
+arch="all"
+license="LGPLv2+ or MIT"
+depends="python"
+depends_dev=""
+makedepends="curl-dev python-dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://pycurl.sourceforge.net/download/pycurl-$pkgver.tar.gz"
+
+_builddir="$srcdir"/pycurl-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	python setup.py build || return 1
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+}
+
+md5sums="919d58fe37e69fe87ce4534d8b6a1c7b  pycurl-7.19.0.tar.gz"
diff --git a/testing/py-urlgrabber/APKBUILD b/testing/py-urlgrabber/APKBUILD
new file mode 100644
index 0000000000..3d812a5b8a
--- /dev/null
+++ b/testing/py-urlgrabber/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=py-urlgrabber
+pkgver=3.9.1
+pkgrel=0
+pkgdesc="python module for fetching files"
+url="http://urlgrabber.baseurl.org/"
+arch="noarch"
+license="LGPL"
+depends="python py-curl"
+depends_dev=""
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://urlgrabber.baseurl.org/download/urlgrabber-$pkgver.tar.gz"
+
+_builddir="$srcdir"/urlgrabber-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	python setup.py build || return 1
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+}
+
+md5sums="00c8359bf71062d0946bacea521f80b4  urlgrabber-3.9.1.tar.gz"
diff --git a/testing/strongswan/APKBUILD b/testing/strongswan/APKBUILD
index e89a401886..b90a3e2185 100644
--- a/testing/strongswan/APKBUILD
+++ b/testing/strongswan/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jesse Young <jlyo@jlyo.org>
 # Maintainer:
 pkgname=strongswan
-pkgver=4.5.2
+pkgver=4.6.1
 pkgrel=0
 pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
 url="http://www.strongswan.org/"
@@ -11,7 +11,7 @@ depends="iproute2 openssl"
 depends_dev="sqlite-dev openssl-dev curl-dev gmp-dev"
 makedepends="$depends_dev"
 install=""
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-doc"
 source="http://download.strongswan.org/$pkgname-$pkgver.tar.bz2 adns.patch strongswan.initd"
 
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -65,10 +65,10 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	install -m755 -D "$srcdir/$pkgname.initd" \
 		"$pkgdir/etc/init.d/$pkgname"
-	rm "$pkgdir"/usr/lib/strongswan/plugins/*.la || return 1
-	rm "$pkgdir"/usr/lib/*.la || return 1
+	rm "$pkgdir"/usr/lib/ipsec/plugins/*.la || return 1
+	rm "$pkgdir"/usr/lib/ipsec/*.la || return 1
 }
 
-md5sums="ac33b8f849a274127f84df0838cae953  strongswan-4.5.2.tar.bz2
+md5sums="85a28a12ed6f286a5bc9117e3a9386bb  strongswan-4.6.1.tar.bz2
 8f02d0e582ac9ac60c28e465b626481d  adns.patch
 fb9822512d02f521af8812db22a5175e  strongswan.initd"
diff --git a/testing/v8/APKBUILD b/testing/v8/APKBUILD
new file mode 100644
index 0000000000..40ef6e8d85
--- /dev/null
+++ b/testing/v8/APKBUILD
@@ -0,0 +1,60 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=v8
+pkgver=3.7.7
+pkgrel=1
+pkgdesc="V8 JavaScript/ECMAScript Engine"
+url="http://www.chromium.org/"
+arch="x86 x86_64 arm"
+license="BSD"
+depends=""
+depends_dev=""
+makedepends="scons wget"
+install=""
+subpackages="$pkgname-dev"
+source="http://gsdview.appspot.com/chromium-browser-official/v8-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/v8-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+
+	v8_arch=${CARCH}
+	test ${CARCH} = x86 && v8_arch=ia32
+	test ${CARCH} = x86_64 && v8_arch=x64
+
+	msg "building for ${v8_arch}"
+
+	export LINKFLAGS="${LDFLAGS}"
+
+	scons -j$JOBS \
+		library=shared \
+		inspector=on \
+		objectprint=on \
+		console=readline \
+		soname=on \
+		arch=${v8_arch} \
+		|| return 1
+}
+
+package() {
+	cd "$_builddir"
+
+	mkdir -p "$pkgdir"/usr/include
+	cp include/* "$pkgdir"/usr/include
+
+	mkdir -p "$pkgdir"/usr/lib
+	install -c -m755 libv8-${pkgver}.so "$pkgdir"/usr/lib/libv8-${pkgver}.so
+	ln -sf libv8-${pkgver}.so "$pkgdir"/usr/lib/libv8.so
+}
+
+md5sums="f49dee4890a3c0c35c0a2c7610c79bdf  v8-3.7.7.tar.bz2"
diff --git a/testing/virt-manager/APKBUILD b/testing/virt-manager/APKBUILD
index be9c3070ef..3692142468 100644
--- a/testing/virt-manager/APKBUILD
+++ b/testing/virt-manager/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=virt-manager
 pkgver=0.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="GUI for managing virtual machines"
 url="http://virt-manager.et.redhat.com/"
 arch="noarch"
 license="GPL"
 depends="gconf gtk-vnc librsvg libvirt libxml2 py-dbus py-gnome-gconf python 
-	rarian virtinst vte"
+	rarian virtinst vte py-urlgrabber"
 depends_dev="intltool"
 makedepends="$depends_dev"
 install=