gentoo auto-resync : 08:10:2022 - 19:30:29

10 files changed, 118 insertions, 9 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 4a7c2d5982f4..a77d88e5c0c6 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 58b7272e357c..2f5db6207bb3 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,5 +1,5 @@
 DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f
-EBUILD libva-intel-driver-2.4.1-r1.ebuild 1315 BLAKE2B b3143086acc0278e1d84e0ca35a34325ba667395f547437205c70a8182d560cda32a704fb0016674f0691a661e19ad7321e88ad9fb09dedb4db2610f9d0a0a0a SHA512 4dd1702c81a808eaafe6b519eeef298bf1e6c6872c3b87011f928f90abd642decfd53f43b8663f9f646fe147d1e4e6e871ef8fa496b92e42cdd1c996fd18f530
-EBUILD libva-intel-driver-2.4.1-r2.ebuild 1434 BLAKE2B 07fdb241b574bcc1ef95e3186a41a364ae94862ee14630727eab0d69e7040bec562cfcb662af6f421e4f017db897e5e636876251b9136184035be6f7d56dfb25 SHA512 dd3f28e992940fe73f5f3838ae61ef4b38334eb33deab62debf4aa793f74895a682d5e77e6012bea24977298ba1e4a1379cda4f6dd4b23399f9221213cd244e2
-EBUILD libva-intel-driver-9999.ebuild 1317 BLAKE2B 916b05fa1c1b8baf20fcbea3256f04771920362863af4fb13688b539a819125227e63ea574081089b8c42b09278a1815aeaf217ac914204e05930e19fde0e9b7 SHA512 9825c011b68f4610f6600bae36a4b6a099aa34cedd6de6a7be2345bd584e1e8c3f00adbcc670a1ac9ffd8731c25da151c7d842eff241fc2e2efa50a8654f7e35
+EBUILD libva-intel-driver-2.4.1-r3.ebuild 1311 BLAKE2B 2f764e5429a90a1cba5a8b2affb9a59eb29fe39d78554d985da93b6e57adbcd00f2f80f9be505c765b38a76e9dc038846f3618b55f28a35a0b0ecae4bcf444fe SHA512 bcfe4a520c19abffe26494adb3b55307592994cc57186ee0253eeb16a3a52f48c73f28b6bd964def8f1fede4f77c96121e136a96d9a2465eed2a1210dc8a23e8
+EBUILD libva-intel-driver-2.4.1-r4.ebuild 1430 BLAKE2B 3b910e5e2187680f8fcb09d1ce619a8baad12b0530156e4c307a6c4e051635232b6be1b4d3b43bf924cf6047862ef9c1d575fdaebd3b54ef39aaa868115b480e SHA512 3cbd60b3cedca21fe9bc727ee85a658f49404920793a963b6402761854d5bfb1c850a609a80136d9b2f375d1b4658fba684e9f1dac7d62070f5d1f2be69660f7
+EBUILD libva-intel-driver-9999.ebuild 1313 BLAKE2B 2a777e944bf6ffc10a6be931a3e8124a7b2d7474413b8abe805d9940ec14073ef8653dd1babd801d00fb447da06a11b1324373aa3c22e0b9f74a4fa3e354091a SHA512 ccf69b0c0835c95b3341f56427755ff6d33fa6893a5cd96630e38d7a4891b63e15471b80d3c2812eff6b488680555e10c9c40448632bd214cfecf047bf492d3d
 MISC metadata.xml 492 BLAKE2B b9c22e0ff6c7a984e4ea52caa889c14d15a8a77bddac8a088bc872290c619c84a4814986d97a4c5712f3f57288b1d5257b86ef1d5446e4d4420c0e5cf018c36b SHA512 343f913540aecf5e9b8eaf08ee225f55b238695d894e681e8f643f04ffb2a695aae1773c9fbaafb76df6aa929acc3dc23d77054fff6857c09785c2165bfdd572
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r3.ebuild
index 6952b1401a4e..c5c3c7cf3b1e 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r1.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r3.ebuild
@@ -26,7 +26,7 @@ RESTRICT="test" # No tests
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
-	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-2.4.0:=[X?,wayland?,${MULTILIB_USEDEP}]
 	wayland? (
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 		>=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}]
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r2.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild
index 2adee1dcc69b..779bdafe7a5e 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r2.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild
@@ -26,7 +26,7 @@ RESTRICT="test" # No tests
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
-	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-2.4.0:=[X?,wayland?,${MULTILIB_USEDEP}]
 
 	hybrid? (
 		>=x11-libs/intel-hybrid-codec-driver-2.0.0[X?,wayland?]
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index 4f49ea343696..0ffef2a51f0a 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -26,7 +26,7 @@ RESTRICT="test" # No tests
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
-	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-2.4.0:=[X?,wayland?,${MULTILIB_USEDEP}]
 	wayland? (
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 		>=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}]
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 58e9b111adeb..d668b4748373 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,6 +1,8 @@
 DIST libva-2.14.0.tar.gz 266254 BLAKE2B 1ad504dc7f72b15bb35b486a5fcb327c14663b80068791aa983f2d46876b1504b8330888430b85d2fb309bd5aa2a11c4a34589b68fa140e10b27cb952e3eb5c7 SHA512 8d87b49c7242174d05dca709bd79e6e45cea6e6060d12f5cf7636433be587c2b3a6c3183f632fb0ff49b19f31f915a2a62818c26f57c3a8f40741aa1ab8270b4
 DIST libva-2.15.0.tar.gz 264429 BLAKE2B c1bd8c3de25a266b8cc35400db464ea8b0dc81f017951b2814874c93ebf6b1b9e09860749c9eb932fe54b012e6295ff7d9cf0895f5af5fe6963f7dc3cea809b2 SHA512 fd96da76db6e6a80bb83d74a6f736e168d3a27cd200e77553d8ca9a19b9766b101b2e550953ca50445e1874f7ad59bf6c3a166eee6c83fe66c924b5a3494be9d
+DIST libva-2.16.0.tar.gz 267735 BLAKE2B 59c5dc39e1c40c2f24455ec7b0588eb4898b3cab7c49ffbca997882c634ca7be6334fdb820afada8e2ebf39eb2166c95610df190d90c2a98c4fc25d25c733b32 SHA512 08a1481ac693ee9de639f2abd483e1fabfee87f9c04ead066dfce5c24cc7f1d1a29d8664707bb534ce4cc25e52086c5e4a0ecfe704ca59590ce41353fda31c2a
 EBUILD libva-2.14.0.ebuild 1652 BLAKE2B 7b6314189ce333ca0f7e0be76586d8f99ea5dc560b32f59aa3817362a5c2b006491cfd98d38f32d28b26ff6a810151fe528fa403aaab8a2e0630bbc8ab1d2973 SHA512 069ea9cd19517f164340c2463e85a33058954597df0c126fcf1c9e61374829c6b2377f014a86185ff7ac2cd619fbdd477a279bd0ff1f25d78e10ba58e4bff8cd
 EBUILD libva-2.15.0.ebuild 1653 BLAKE2B d51ce21c080ac890b8fa6481e5bc3dae8ba42488d5a65657193451827f5ef2e24b11170033bc99a56be671d35f553f37e9f2c7770d0097665d3aadf56a3e6c61 SHA512 051593c8fd9c7e1733eee0480f78d5845bf229b4adcf2b66ce887d8322db75827cb8db255e174367f7eac4f19854590e0eb35ab2cc8d10ed4cd05bcaba285b92
+EBUILD libva-2.16.0.ebuild 1651 BLAKE2B d035367f856c972486180108691e5b53dceb781409292424b01dd8b57eb4f49110683411eb3a73d1f856b5399e3bde74a7bf4b10f5ce063a0ec9488d53f4866e SHA512 06e96a9a2384793afbd331d445473ea21a1e71c8b0955b572cd23865104d3e2e535c778e0c3a2bc3d758a037da0d80e70cff33f4c1904563e12075a1a57b2946
 EBUILD libva-9999.ebuild 1656 BLAKE2B b6487f87c791e66bfaa02d70062447d11ef2b10aa57d79607b81099c83344b50864e1141f4b861667de76ae13fc694140b0836eb6bbfd2450b4346f7d384443f SHA512 1789ded64b9b4df76fc8de6d96544289806e5ccb0ffd4351ade1b1fafe7704197213f1f052c842427adc62b6f85a8725cb1c8af5cf96a62f5e062c5e224f5f72
 MISC metadata.xml 407 BLAKE2B 9c609122fe71e96581d55f64dcb1d1b1dc513c7e8efb6c54823011f8788cfd750114752616f06149b1ad22ae47239a76fb38a8f8fe73a66f2c5def9a29e994fd SHA512 9d0fe2952d89278e8753fba47cd51cd76a73bf6f6566327ad425a7a9d64b4e5d72b12d8e2dff8f6aa97ac960121b3a4a73c87bcfed1a7d1e611e206c0f814925
diff --git a/x11-libs/libva/libva-2.16.0.ebuild b/x11-libs/libva/libva-2.16.0.ebuild
new file mode 100644
index 000000000000..b21071709f6d
--- /dev/null
+++ b/x11-libs/libva/libva-2.16.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib optfeature
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva"
+else
+	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+IUSE="opengl wayland X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	wayland? ( dev-util/wayland-scanner )
+	virtual/pkgconfig
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/va/va_backend_glx.h
+	/usr/include/va/va_x11.h
+	/usr/include/va/va_dri2.h
+	/usr/include/va/va_dricommon.h
+	/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		-Ddisable_drm=false
+		-Dwith_x11=$(usex X)
+		-Dwith_glx=$(usex X)
+		-Dwith_wayland=$(usex wayland)
+		-Denable_docs=false
+		-Denable_va_messaging=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature_header
+	optfeature "Older Intel GPU support" x11-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support" x11-libs/libva-intel-media-driver
+}
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index b13a0bf82531..ba75a713e4a4 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,5 +1,6 @@
 AUX wxGTK-3.0-gtk3-translation-domain.patch 454 BLAKE2B fd0b6d6a0c1fe7f1dfbd7692d549dfd6f78c85e25f06e2e44630ca9b3c9dda4c12af2df6e4fcc02de73e75524631b858cc21b9f63b8799b0d157a38bd5541fac SHA512 8cdf57558e8d09e3e0613c25ac7701cce0bf78da13060e2b36167b69b8ae4f265607cb5216a33054f6c0c2f21beba8cc7f8297f4de2b2db1ec9f3f5bb8177ff3
 AUX wxGTK-3.0.5-collision.patch 6298 BLAKE2B 711d7b94b6a0de4bdda21caa2bfcfd799c0d57a8d1d4a820e6da397768b075f415b8e438502167446b3be6b948420d1c1a31c401bd5e7bb2b549e3a95dcccad8 SHA512 62bbf952eac4a3485a2cfa3e6908b2272cb6f47632f17e60f413ad34b64e331423189a31c4259c8283120b4b1351f915e226f5c749787a5c69737779cc9edb59
+AUX wxGTK-configure-tests.patch 560 BLAKE2B 86a735c58abc8690cd943ff58a39140a636c56dcde08f47d27dbdcf99790216ebe0f4524f2f7cd67e35748c32adaee377c4e8a4b606975115c666cbc453b5173 SHA512 f02b708e5de66a4a7dce9f1adef1ebd1461ef68acee502b54d514a0ce4e5fe998eaad9a9ec7b1bec9aa4d8803a4042111ea4cddafe8e2f68d3d122faf90465df
 AUX wxGTK-ignore-c++-abi.patch 1657 BLAKE2B 5d865c83174f2540b798a2930f8d5ae8336f031214691fe7d5cd8c283faf9511fff260735d9dcd293e6377be0e96a6521e84ceae4560f2fef8fc7e7ed5642cd6 SHA512 649551eeacc9915f249ece1c3ed79959f0f0129e54373bfbe84ea5fbf2b8e0ba7778d6a22ac6f165e5d4e85a3ea4320274296b1b2a8e623acb11300fe44478f8
 DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9
 DIST wxGTK-3.0.5_p20210214.tar.xz 4560 BLAKE2B ac1815e679adfb2c36d74be0a4a9cc32d52e6b0b05a14393334bc5d30a8bc0da1386415a5b59a3f6dc4807d283272d36f033caa55a300c8c30cf0c402554b8bd SHA512 f1e34379b8bf594a68486bb6eccbd93f36dc2aeca37c0a7eb23de81c1c3825396437a65c43ed8d94673131e97414d49449ed51729970bf8b8e4608d36974a335
@@ -8,5 +9,5 @@ DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce
 DIST wxWidgets-3.0.5-docs-html.tar.bz2 23844256 BLAKE2B f5b5bef129302ae1ded7a651e652b127ad9d548a00a498f06a4d4f868dc3bc33411ded2602c04c8329e927550d032bdbe633c2c7d1a7f89265874685d3cb3d9b SHA512 f839e67660f2b08aa28d1596a3b7af2c35f7c2c0505c6e6d45888845397212b3dd71c8d34115321e9a4347b9d92a0ce767bb76defd14c172e51c2a3df96cc3ac
 DIST wxWidgets-3.0.5.1.tar.bz2 19739206 BLAKE2B da270cb8e4fc22b8d892ba80fbb4cc71578f642ca07102006f914a80331a254e746de6c91e61b585c0b1ab3abadd17d80a0eaa3efd48a3d412cf7202101abc7a SHA512 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d
 EBUILD wxGTK-3.0.4-r3.ebuild 3752 BLAKE2B 2ac424c442de6e6174d5607236b27b2c71573a6a74faa3e7186c33b103cbfa1a6b48cae00e1f810225bf76ed4a4d060def5af4bd3369b2fe3101c493c14d384e SHA512 c4209a504c3ac482b27a3fb99f8f8cec5e78671b7b22a6fcb6ad3fdf57bf97a7d6fa39ccb651168014f2482f320b6533b28579929d1c193531d57f10e0099783
-EBUILD wxGTK-3.0.5.1.ebuild 5220 BLAKE2B 65b36dbef222328b5b8505b2c5ff1e615ed0aa4c46558121690f1b0db30fd2fbc685b8457e951502c7e54274b8671d52252e0e921aebe4c9b283c56799426f28 SHA512 b8995dda420a50e63d4a3a54e0be3d21e2cb141ddd666b59e7ee61a71b08f83049b74b8105c37c2d986353223cafff372a33364465baf0b45b722aed9d8cefca
+EBUILD wxGTK-3.0.5.1.ebuild 5484 BLAKE2B 8d7dd6be84267427670ee2572c934840c3fbfe009762dafbf3741884ad8df13cf75f674837f7df4f33a776ab0f69e54dfc7f3970aadea0e0af644615d584d080 SHA512 1b811d61ee068d3732de88635ff0aaf6c635ca2f62627b65d44fd671216ee8adc1205084d66585173dc7ac0f589be30f0216ef73ac8b2afa840acc9323e53a26
 MISC metadata.xml 760 BLAKE2B e665c57ff50c54f0630ca7d7f78764f81d516cb93c397f6c4e90e57534d18bf54872a291c2c928b57e6b630d7a8ff7b385677de07de970490ad810983d5f61d3 SHA512 7f2e0cfc91d5622ecbe4dd94452ccb130214b68e89e400a7f9ef505f9bb28cac9bd585c1a612c45bd314a8fa0291f74cbf3c31718b1bb11cad584b80bca99d24
diff --git a/x11-libs/wxGTK/files/wxGTK-configure-tests.patch b/x11-libs/wxGTK/files/wxGTK-configure-tests.patch
new file mode 100644
index 000000000000..efbb2d7c55bf
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-configure-tests.patch
@@ -0,0 +1,28 @@
+diff --git a/configure b/configure
+index 0f3c4c9..92c84f3 100755
+--- a/configure
++++ b/configure
+@@ -1368,6 +1368,7 @@ enable_dependency_tracking
+ enable_precomp_headers
+ with_cppunit_prefix
+ with_cppunit_exec_prefix
++enable_tests
+ '
+       ac_precious_vars='build_alias
+ host_alias
+@@ -40955,8 +40956,13 @@ fi
+ 
+   fi
+ 
+-
+-
++# explicit override to enable or disable tests
++if test "${enable_tests+set}" = set; then
++    SUBDIRS="$SUBDIRS tests"
++fi
++if test "${disable_tests+set}" = set; then
++	SUBDIRS="${SUBDIRS% tests}"
++fi
+ 
+ 
+ for subdir in $SUBDIRS; do
diff --git a/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
index a7260ae5a0be..bb964df9baf4 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild
@@ -21,7 +21,9 @@ S="${WORKDIR}/wxWidgets-${PV}"
 LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
 SLOT="${WXRELEASE}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+X doc debug gstreamer libnotify opengl pch sdl tiff webkit"
+IUSE="+X doc debug gstreamer libnotify opengl sdl test tiff webkit"
+REQUIRED_USE="test? ( tiff ) tiff? ( X )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-eselect/eselect-wxwidgets-20131230
@@ -52,6 +54,7 @@ DEPEND="${RDEPEND}
 	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
+	test? ( >=dev-util/cppunit-1.8.0 )
 	>=app-eselect/eselect-wxwidgets-20131230
 	virtual/pkgconfig"
 
@@ -59,6 +62,7 @@ PATCHES=(
 	"${WORKDIR}"/wxGTK-3.0.5_p20210214/
 	"${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
 	"${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878
+	"${FILESDIR}/${PN}-configure-tests.patch"
 )
 
 src_prepare() {
@@ -72,7 +76,7 @@ src_prepare() {
 		-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
 		-e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \
 		-e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
-		Makefile.in || die
+		Makefile.in tests/Makefile.in || die
 
 	sed -i \
 		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
@@ -128,6 +132,7 @@ multilib_src_configure() {
 		$(use_with libnotify)
 		$(use_with opengl)
 		$(use_with tiff libtiff sys)
+		$(use_enable test tests)
 	)
 
 	# wxBase options
@@ -136,6 +141,11 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
+multilib_src_test() {
+	emake -C tests
+	(cd tests && ./test) || die
+}
+
 multilib_src_install_all() {
 	cd docs || die
 	dodoc changes.txt readme.txt