diff --git a/testing/evolution/APKBUILD b/testing/evolution/APKBUILD
new file mode 100644
index 0000000000000000000000000000000000000000..bf1671165471f39a8fffc799d0e85ac778d2859a
--- /dev/null
+++ b/testing/evolution/APKBUILD
@@ -0,0 +1,53 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=evolution
+pkgver=3.18.4
+pkgrel=0
+pkgdesc="evolution mail client"
+url="http://projects.gnome.org/evolution"
+arch="all"
+license="GPL"
+depends="gnome-icon-theme gsettings-desktop-schemas highlight"
+depends_dev="gtk+3.0-dev glib-dev itstool libxml2-dev libxml2-utils
+	webkitgtk-dev gcr-dev evolution-data-server-dev enchant-dev
+	libcanberra-dev gtkspell-dev libgweather-dev openldap-dev
+	libnotify-dev"
+makedepends="$depends_dev gperf flex bison"
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+
+_builddir="${srcdir}/${pkgname}-${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"
+	ac_cv_libiconv_utf8=yes\
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-pst-import \
+		--disable-gnome-desktop \
+		--disable-autoar \
+		--disable-libcryptui \
+		--disable-gtkspell \
+		--with-openldap \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="9262300694650517046b48fb2ae98d30  evolution-3.18.4.tar.xz"
+sha256sums="8161a0ebc77e61904dfaca9745595fefbf84d834a07ee1132d1f8d030dabfefb  evolution-3.18.4.tar.xz"
+sha512sums="ddb7922cedd490808c21a21d6a2e23f7399f1569bea69d5e0434f27b0f5b75b898ff68f17883bfd75eddb2ec9059628406e1b1f7811e1962a6da2dff4777ade2  evolution-3.18.4.tar.xz"
diff --git a/unmaintained/evolution/APKBUILD b/unmaintained/evolution/APKBUILD
deleted file mode 100644
index e0d61649433efc37516a06af899de5bed0db0fd1..0000000000000000000000000000000000000000
--- a/unmaintained/evolution/APKBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=evolution
-pkgver=2.32.1
-pkgrel=4
-pkgdesc="evolution mail client"
-url="http://projects.gnome.org/evolution"
-arch="all"
-license="GPL"
-depends="gnome-icon-theme"
-depends_dev="gtk+-dev glib-dev libsoup-dev libxml2-dev gconf-dev libgdata-dev db-dev libgweather-dev libgnome-keyring-dev libical-dev nspr-dev nss-dev sqlite-dev evolution-data-server-dev
-	gnome-desktop-dev libunique-dev gtkhtml-dev gstreamer-dev gst-plugins-base-dev gtkimageview-dev openldap-dev"
-makedepends="$depends_dev gperf flex bison"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
-subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
-
-_builddir="${srcdir}/${pkgname}-${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
-
-	# to build against gtk+-2.24
-	# http://bugs.gentoo.org/show_bug.cgi?id=352400
-	sed -i -e "s:-DGTK_DISABLE_DEPRECATED::" configure
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-nm \
-		--disable-pst-import \
-		--disable-scrollkeeper || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="47c1d45366aaa69e79a320f351ef065d  evolution-2.32.1.tar.bz2"
diff --git a/unmaintained/evolution/evolution.post-install b/unmaintained/evolution/evolution.post-install
deleted file mode 100644
index 9a51eff319b30b580913add910704dd8fc2752eb..0000000000000000000000000000000000000000
--- a/unmaintained/evolution/evolution.post-install
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-for i in \
-	apps-evolution-attachment-reminder.schemas \
-	apps-evolution-mail-notification.schemas \
-	apps-evolution-mail-prompts-checkdefault.schemas \
-	apps-evolution-template-placeholders.schemas \
-	apps_evolution_addressbook.schemas \
-	apps_evolution_calendar.schemas \
-	apps_evolution_email_custom_header.schemas \
-	apps_evolution_shell.schemas \
-	bogo-junk-plugin.schemas \
-	evolution-mail.schemas \
-; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/evolution/evolution.post-upgrade b/unmaintained/evolution/evolution.post-upgrade
deleted file mode 100644
index 9a51eff319b30b580913add910704dd8fc2752eb..0000000000000000000000000000000000000000
--- a/unmaintained/evolution/evolution.post-upgrade
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-for i in \
-	apps-evolution-attachment-reminder.schemas \
-	apps-evolution-mail-notification.schemas \
-	apps-evolution-mail-prompts-checkdefault.schemas \
-	apps-evolution-template-placeholders.schemas \
-	apps_evolution_addressbook.schemas \
-	apps_evolution_calendar.schemas \
-	apps_evolution_email_custom_header.schemas \
-	apps_evolution_shell.schemas \
-	bogo-junk-plugin.schemas \
-	evolution-mail.schemas \
-; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/unmaintained/evolution/evolution.pre-deinstall b/unmaintained/evolution/evolution.pre-deinstall
deleted file mode 100644
index 9216ac8c2b49a11d6b0330008f2ac0314ea317a3..0000000000000000000000000000000000000000
--- a/unmaintained/evolution/evolution.pre-deinstall
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-for i in \
-	apps-evolution-attachment-reminder.schemas \
-	apps-evolution-mail-notification.schemas \
-	apps-evolution-mail-prompts-checkdefault.schemas \
-	apps-evolution-template-placeholders.schemas \
-	apps_evolution_addressbook.schemas \
-	apps_evolution_calendar.schemas \
-	apps_evolution_email_custom_header.schemas \
-	apps_evolution_shell.schemas \
-	bogo-junk-plugin.schemas \
-	evolution-mail.schemas \
-; do
-        echo "Uninstalling GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$i >/dev/null
-done