Use virtualx eclass for tests requiring X.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/media-gfx/scantailor/ChangeLog b/media-gfx/scantailor/ChangeLog
index cf2d922c6213b6f284ed0c15af0b9228bf58f27e..464109796f0fc8c854321b157d304ffddcc8c564 100644 (file)
--- a/media-gfx/scantailor/ChangeLog
+++ b/media-gfx/scantailor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/scantailor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/scantailor/ChangeLog,v 1.6 2011/12/06 21:18:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/scantailor/ChangeLog,v 1.7 2011/12/07 03:13:10 radhermit Exp $
+
+  07 Dec 2011; Tim Harder <radhermit@gentoo.org> scantailor-0.9.10.ebuild:
+  Use virtualx eclass for tests requiring X.
 
   06 Dec 2011; Tim Harder <radhermit@gentoo.org> -scantailor-0.9.9.ebuild,
   -scantailor-0.9.9.2.ebuild, metadata.xml:

diff --git a/media-gfx/scantailor/Manifest b/media-gfx/scantailor/Manifest
index 03d23713da2946038b94ea4aff800279d4894bc5..b438119688bc70c6a680098ecc0072b1cc4d4924 100644 (file)
--- a/media-gfx/scantailor/Manifest
+++ b/media-gfx/scantailor/Manifest
@@ -4,17 +4,17 @@ Hash: SHA512
 AUX scantailor-0.9.9-environment_flags.patch 732 RMD160 8f4fbde7c63e49bfa078be45d7ddbd1cd3b9a240 SHA1 d2cd2f3223581973adcd621e6083be34f77ace87 SHA256 a346812401027d1f3a21ed5928685c877cf2105d0c1f2fcd7737327d338f76d5
 AUX scantailor-gcc46.patch 3874 RMD160 287ccd06a5a5335abdde85dfd728339baa8f01f4 SHA1 466d7929fe1d1370cc15c0ed7600efc832009ead SHA256 f52312ecbe656353b5fcb69702c5fcb84b5e288453cc8417f4a099fdc6deb68b
 DIST scantailor-0.9.10.tar.gz 1124348 RMD160 548681bbca511e90c52ab3ade6ff6d32729774b6 SHA1 37ed3a4db17e2eaca9f4ada8cc29137df657e5fb SHA256 0b574eabfb65e4dcf3915d00ad3da31d464060458ffaeb49e4257e97301f93a0
-EBUILD scantailor-0.9.10.ebuild 1185 RMD160 381d789381a0886b3f8b74a3451afb4321eb32c1 SHA1 a3a5b8b3a951208e75fbf0075128504053305f12 SHA256 3af9a69e1dffd02eef1093f25949224d72ba60e7013551128b8e511d74b5eead
-MISC ChangeLog 1274 RMD160 c4cf7e48a9e7c2fc02303b4286cd1bd9ec90442f SHA1 a2e27a20a41331b52d53aa4ea47a4b03344c1348 SHA256 3ffbb07fad03ae736531c95734b7323eee2ba0217db1947f77fbd571e7fcd017
+EBUILD scantailor-0.9.10.ebuild 1109 RMD160 d6bb5922e76a2ee93303e1817d1afce3fbbd7aaf SHA1 c06c7326f200a633febc1fb3b05dea2ecc8ceb39 SHA256 d8df1a54d599d334293ffae77dba1e72d45dcedf379458313df3f3c1606d6da3
+MISC ChangeLog 1395 RMD160 e9f04e588a23c82a46a24ca1066b4733fac7f4a3 SHA1 16d23c3eae4facdb522da068e08832e778bf94b7 SHA256 ed31278acb601ba2b950aac42dee746ebc6bcad999bc258127549893c3e672a6
 MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO3obGAAoJEEqz6FtPBkyjXOQH/05Nku+A6PAVD/X3YCG7TYAX
-O3+hzM51qra/dBAKT8qOVk5mGJ7dLh5WqTbB/Hin77cr+SDfUEqG+uJ8OlQQFQ7X
-mLHjiIsMJEPo/703aNMnesuuh31xuSf5vmFrd1RaalagcJQz4aFhxCPSph9yJZia
-2gjLK8EfbItHrdy8UaXjLWBIkK/8UFzgI4qbZsLTejfZ2U4BCA/+ILnAlxNOZ4HL
-QNK+DOKE3Q9IYQNwMJkYD1qcj0bf1ADeS51ixUnlafowcDNIiZWfuDFgSscMQ8xX
-8wVqDnbZe+oA1v3BWIe9Alb34j0ze2sLhhVXyJMcyZU4gua/Vc+Ija6nxRQx0JQ=
-=TKjV
+iQEcBAEBCgAGBQJO3tntAAoJEEqz6FtPBkyjdi4H/AtiUtzaktnXfW7WzT9OWTlx
+y+neHhY5PvYMp7nQK3T3iwEU53R8Jb/T7GoKcB9fqBTLeNPuEOwyakuYa7endWHd
+dbLKBVqJoXcnOF/p34DJVBGZ71cjUD5PnoIsmLuy3YTE3Ok+n1F1F+0OLFLjvMoT
+p1eYaD2XcEq+kgGfYZuU4JkrHuQfZM9kGcCfaRcVXhI38pJGFE5XsncRN6MeJnom
+8htSCRHC6ssS+qaZUBrydLBhaOubEeTdqZoUcXJkHip6vK0d8nXSvKCrHCrRkeva
+qj0ws98BAx6KxotJVKJMLhhY4jLanA7AFtpjaYkXFu8hlwdqr8DGfpE0tebbESE=
+=7c6e
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/scantailor/scantailor-0.9.10.ebuild b/media-gfx/scantailor/scantailor-0.9.10.ebuild
index 638fa66e3714a3d696903e9b17dd5005758aad95..c27089156292134b5a04973b9524a0a7df0502ad 100644 (file)
--- a/media-gfx/scantailor/scantailor-0.9.10.ebuild
+++ b/media-gfx/scantailor/scantailor-0.9.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/scantailor/scantailor-0.9.10.ebuild,v 1.2 2011/12/06 21:14:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/scantailor/scantailor-0.9.10.ebuild,v 1.3 2011/12/07 03:13:10 radhermit Exp $
 
 EAPI=4
-inherit cmake-utils eutils
+inherit cmake-utils eutils virtualx
 
 DESCRIPTION="A interactive post-processing tool for scanned pages"
 HOMEPAGE="http://scantailor.sourceforge.net/"
@@ -29,13 +29,6 @@ PATCHES=(
        "${FILESDIR}"/${PN}-gcc46.patch
 )
 
-src_prepare() {
-       # Skip image processing tests that require X
-       sed -i -e "/^ADD_TEST(ImageProcTests/d" CMakeLists.txt || die
-
-       base_src_prepare
-}
-
 src_configure() {
        mycmakeargs=(
                $(cmake-utils_use_enable opengl)
@@ -44,6 +37,11 @@ src_configure() {
        cmake-utils_src_configure
 }
 
+src_test() {
+        cd "${CMAKE_BUILD_DIR}" || die
+       Xemake test
+}
+
 src_install() {
        cmake-utils_src_install