diff --git a/srcpkgs/kyua-cli/patches/0001-Cache-configure-result-of-getcwd-NULL-0-test.patch b/srcpkgs/kyua-cli/patches/0001-Cache-configure-result-of-getcwd-NULL-0-test.patch
deleted file mode 100644
index 17fc6adfa13..00000000000
--- a/srcpkgs/kyua-cli/patches/0001-Cache-configure-result-of-getcwd-NULL-0-test.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d02bdfc32e748d3763d639cf291bffff4b121df2 Mon Sep 17 00:00:00 2001
-From: Juan RP <xtraeme@gmail.com>
-Date: Sun, 3 Nov 2013 08:50:03 +0100
-Subject: [PATCH] Cache configure result of getcwd(NULL,0) test.
-
-This is the last configure test that must be cached for a proper
-cross compilation.
----
- configure.ac | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3ce8e8e..fbe6c57 100644
---- configure.ac
-+++ configure.ac
-@@ -58,16 +58,20 @@ KYUA_MEMORY
- AC_CHECK_FUNCS([putenv setenv unsetenv])
-
-
--AC_MSG_CHECKING([whether getcwd(NULL, 0) works])
--AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdlib.h>
-+AC_CACHE_CHECK(
-+ [whether getcwd(NULL, 0) works],
-+ [kyua_cv_getcwd_null_0_works], [
-+ AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdlib.h>
- #include <unistd.h>],
-- [char *cwd = getcwd(NULL, 0);
-- return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;])],
-- [AC_MSG_RESULT(yes)
-- AC_DEFINE([HAVE_GETCWD_DYN], [1],
-- [Define to 1 if getcwd(NULL, 0) works])],
-- [AC_MSG_RESULT(no)])
--
-+ [char *cwd = getcwd(NULL, 0);
-+ return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;])],
-+ [kyua_cv_getcwd_null_0_works=yes],
-+ [kyua_cv_getcwd_null_0_works=no])
-+])
-+if test "${kyua_cv_getcwd_null_0_works}" = yes; then
-+ AC_DEFINE([HAVE_GETCWD_DYN], [1],
-+ [Define to 1 if getcwd(NULL, 0) works])
-+fi
-
- AC_PROG_RANLIB
-
---
-1.8.4.1
-
diff --git a/srcpkgs/kyua-cli/template b/srcpkgs/kyua-cli/template
deleted file mode 100644
index 7861021b4a7..00000000000
--- a/srcpkgs/kyua-cli/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'kyua-cli'
-pkgname=kyua-cli
-version=0.8
-revision=2
-build_style=gnu-configure
-configure_args="
- kyua_cv_attribute_noreturn=yes kyua_cv_lchmod_works=no
- kyua_cv_getopt_gnu=yes kyua_cv_getopt_optind_reset_value=0
- kyua_cv_signals_lastno=31 kyua_cv_getcwd_null_0_works=yes
- ac_cv_path_GDB=/usr/bin/gdb ac_cv_path_UMOUNT=/usr/bin/umount"
-hostmakedepends="pkg-config automake libtool atf-devel doxygen"
-makedepends="atf-devel>=0.16 lutok-devel>=0.4 sqlite-devel kyua-testers"
-depends="kyua-testers"
-replaces="kyua>=0"
-short_desc="Kyua (automated testing framework) - Command line interface"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="Modified BSD"
-homepage="http://code.google.com/p/kyua"
-distfiles="https://kyua.googlecode.com/files/${pkgname}-${version}.tar.gz"
-checksum=28f90929e4b73959bdd08a1d3f5ce7e77e0e4fc9978d10b1b079160428d770b3
-
-pre_configure() {
- autoreconf -fi
-}
diff --git a/srcpkgs/kyua-testers/patches/0001-Cache-configure-result-of-getcwd-NULL-0-test.patch b/srcpkgs/kyua-testers/patches/0001-Cache-configure-result-of-getcwd-NULL-0-test.patch
deleted file mode 100644
index d7631196660..00000000000
--- a/srcpkgs/kyua-testers/patches/0001-Cache-configure-result-of-getcwd-NULL-0-test.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d993fe52e4bc78284950fcaa620088f58f3d35ea Mon Sep 17 00:00:00 2001
-From: Juan RP <xtraeme@gmail.com>
-Date: Sun, 3 Nov 2013 08:33:31 +0100
-Subject: [PATCH] Cache configure result of getcwd(NULL,0) test.
-
-This is the last configure test that must be cached for a proper
-cross compilation.
----
- configure.ac | 23 +++++++++++++----------
- 1 file changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index cf11933..f0c1484 100644
---- configure.ac
-+++ configure.ac
-@@ -56,17 +56,20 @@ KYUA_GETOPT
- KYUA_LAST_SIGNO
- AC_CHECK_FUNCS([putenv setenv unsetenv])
-
--
--AC_MSG_CHECKING([whether getcwd(NULL, 0) works])
--AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdlib.h>
-+AC_CACHE_CHECK(
-+ [whether getcwd(NULL, 0) works],
-+ [kyua_cv_getcwd_null_0_works], [
-+ AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdlib.h>
- #include <unistd.h>],
-- [char *cwd = getcwd(NULL, 0);
-- return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;])],
-- [AC_MSG_RESULT(yes)
-- AC_DEFINE([HAVE_GETCWD_DYN], [1],
-- [Define to 1 if getcwd(NULL, 0) works])],
-- [AC_MSG_RESULT(no)])
--
-+ [char *cwd = getcwd(NULL, 0);
-+ return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;])],
-+ [kyua_cv_getcwd_null_0_works=yes],
-+ [kyua_cv_getcwd_null_0_works=no])
-+])
-+if test "${kyua_cv_getcwd_null_0_works}" = yes; then
-+ AC_DEFINE([HAVE_GETCWD_DYN], [1],
-+ [Define to 1 if getcwd(NULL, 0) works])
-+fi
-
- AC_PROG_RANLIB
-
---
-1.8.4.1
-
diff --git a/srcpkgs/kyua-testers/template b/srcpkgs/kyua-testers/template
deleted file mode 100644
index 1fe66bc09d9..00000000000
--- a/srcpkgs/kyua-testers/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'kyua-testers'
-pkgname=kyua-testers
-version=0.2
-revision=2
-build_style=gnu-configure
-configure_args="
- kyua_cv_attribute_noreturn=yes kyua_cv_lchmod_works=no
- kyua_cv_getopt_gnu=yes kyua_cv_getopt_optind_reset_value=0
- kyua_cv_signals_lastno=31 kyua_cv_getcwd_null_0_works=yes
- ac_cv_path_GDB=/usr/bin/gdb ac_cv_path_UMOUNT=/usr/bin/umount"
-hostmakedepends="pkg-config automake libtool atf-devel"
-makedepends="atf-devel"
-# Needs atf-sh at least.
-depends="atf"
-short_desc="Kyua (automated testing framework) - Testers"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="BSD"
-homepage="http://code.google.com/p/kyua"
-distfiles="https://kyua.googlecode.com/files/${pkgname}-${version}.tar.gz"
-checksum=8e788d9f6a1b86bcf3b436e870cbc801cf7650fa3f0f82da8b025e36ffe84feb
-
-pre_configure() {
- autoreconf -fi
-}