[gentoo-commits] proj/kde:master commit in: kde-base/okteta/files/, kde-base/okteta/

[Johannes Huber]

commit:     988c97e4096627784a90afbbf83bf043d5bd2ba3
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 11:49:09 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 11:49:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=988c97e4

[kde-base/okteta] Re-enable tests, patch out a failing test by Chris Reffett <geekboy72 <AT> gmail.com> bug 264917.

(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit)

---
 kde-base/okteta/files/okteta-4.8.2-test.patch |   29 +++++++++++++++++++++++++
 kde-base/okteta/okteta-4.8.49.9999.ebuild     |    4 +-
 kde-base/okteta/okteta-9999.ebuild            |    4 +-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/kde-base/okteta/files/okteta-4.8.2-test.patch b/kde-base/okteta/files/okteta-4.8.2-test.patch
new file mode 100644
index 0000000..ef6425c
--- /dev/null
+++ b/kde-base/okteta/files/okteta-4.8.2-test.patch
@@ -0,0 +1,29 @@
+--- okteta/core/piecetable/tests/CMakeLists.txt
++++ okteta/core/piecetable/tests/CMakeLists.txt
+@@ -134,26 +134,6 @@
+   oktetacoretestutil ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
+ 
+ 
+-########### grouppiecetablechangeabstractpiecetablechangeiftest ###############
+-
+-set( grouppiecetablechangeabstractpiecetablechangeiftest_SRCS
+-  grouppiecetablechangeabstractpiecetablechangeiftest.cpp
+-  ${abstractpiecetablechangeiftest_SRCS}
+-  ${SUTDIR}/addressrangelist.cpp
+-  ${SUTDIR}/piecetable/replacepiecetablechange.cpp
+-  ${SUTDIR}/piecetable/insertpiecetablechange.cpp
+-  ${SUTDIR}/piecetable/removepiecetablechange.cpp
+-  ${SUTDIR}/piecetable/grouppiecetablechange.cpp
+-)
+-
+-kde4_add_unit_test( grouppiecetablechangeabstractpiecetablechangeiftest
+-  TESTNAME libpiecetable-grouppiecetablechangeabstractpiecetablechangeiftest
+-  ${grouppiecetablechangeabstractpiecetablechangeiftest_SRCS}
+-)
+-target_link_libraries( grouppiecetablechangeabstractpiecetablechangeiftest
+-  oktetacoretestutil ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
+-
+-
+ ########### grouppiecetablechangetest ###############
+ 
+ set( grouppiecetablechangetest_SRCS

diff --git a/kde-base/okteta/okteta-4.8.49.9999.ebuild b/kde-base/okteta/okteta-4.8.49.9999.ebuild
index aa2d812..f2af0da 100644
--- a/kde-base/okteta/okteta-4.8.49.9999.ebuild
+++ b/kde-base/okteta/okteta-4.8.49.9999.ebuild
@@ -17,5 +17,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-# Tests hang, last checked in 4.3.3
-RESTRICT="test"
+# bug #264917, removes failing test
+PATCHES=( "${FILESDIR}/${PN}-4.8.2-test.patch" )

diff --git a/kde-base/okteta/okteta-9999.ebuild b/kde-base/okteta/okteta-9999.ebuild
index aa2d812..f2af0da 100644
--- a/kde-base/okteta/okteta-9999.ebuild
+++ b/kde-base/okteta/okteta-9999.ebuild
@@ -17,5 +17,5 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-# Tests hang, last checked in 4.3.3
-RESTRICT="test"
+# bug #264917, removes failing test
+PATCHES=( "${FILESDIR}/${PN}-4.8.2-test.patch" )