Test files should of course be installed anywhere, bug 376761

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

4 files changed, 41 insertions, 18 deletions

diff --git a/media-libs/libmediawiki/ChangeLog b/media-libs/libmediawiki/ChangeLog
index 56cc8fb261fe..6c79b8a1beb0 100644
--- a/media-libs/libmediawiki/ChangeLog
+++ b/media-libs/libmediawiki/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libmediawiki
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediawiki/ChangeLog,v 1.3 2011/07/29 19:17:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediawiki/ChangeLog,v 1.4 2011/08/09 06:48:14 dilfridge Exp $
+
+  09 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  libmediawiki-2.0.0.ebuild, +files/libmediawiki-2.0.0-tests.patch:
+  Test files should of course be installed anywhere, bug 376761
+
+  09 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  libmediawiki-2.0.0.ebuild, +files/libmediawiki-2.0.0-tests.patch:
+  Test files should of course be installed anywhere, bug 376761
 
 *libmediawiki-2.0.0 (29 Jul 2011)
 
diff --git a/media-libs/libmediawiki/Manifest b/media-libs/libmediawiki/Manifest
index f3fb951829c0..1c3b69ddf762 100644
--- a/media-libs/libmediawiki/Manifest
+++ b/media-libs/libmediawiki/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX libmediawiki-2.0.0-tests.patch 643 RMD160 feccc82a3e2918150ab17c6dcf4c0543ca49bed7 SHA1 b12fdb9662011a21bbb98db4ba3c95e5aa05950d SHA256 3713d22177123b2bc23e6ba9381e4789238047e66bb731eaf9d6b9dfcd0b488f
 DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
-EBUILD libmediawiki-2.0.0.ebuild 804 RMD160 9b96a4b786744a413ba13dafb4ba5298550be2a0 SHA1 86410d99a2facc4f47de5689ab68e09102d264a5 SHA256 7d88036014900c8501cb93ade7c9dcc3ba363a7ddf5c819834a88f3511044449
-MISC ChangeLog 735 RMD160 6897c919707ba6b65538fc05cf08c07b1eb54b3f SHA1 92338f8fe8836cc7ba438614aeb07bfc3313ac20 SHA256 e0fedc34a792cfff9c0928791bb6eb6438991227dc3a87281c83f1d59f4a93f5
+EBUILD libmediawiki-2.0.0.ebuild 850 RMD160 e8f9f7ede2012a4227dc4977b754fcb3d866bf6f SHA1 9c3e9d59560ab69bef31f51f7a9e87e646e9bc48 SHA256 dc3547d9d3af0bde744956df804c1162e0bcefe548d002a15f8bcd3b74f65bba
+MISC ChangeLog 1115 RMD160 cc5d719799b6f374c5b1944aaa43bda6a7cd8090 SHA1 586ce280fbb72f351d669a559bdacf01c92013d8 SHA256 3f1a24707e01cbd955669b654af177a815f44ff6a880fb68ebc33039c16cb6fa
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOMwdaAAoJENwGBM22xffePbgQAIoPBAHmidy4wfMIdN4kvzbQ
-wiOh3/AY+VnA5deng/fwwDUMBcXp9SDDuQQYnQ7k8k5+Vib7Zz3EcwHKoMZLpDgJ
-EKTpOTFuP75Q8MeDTxEf8+99+Ae7pdki/ePPA1s7jnN/nQYvePmIJZku6lpLO6yS
-peOlW3GA/liK0qoO+0QHWpkizaqM5pnO1uwknn74zq0g6b8E+jHvA+jb4NBSwyjW
-+06/+mLIkiDxRzfIv/OoZpdFCM/+4il7lT/xRtuWmQAlr+AIu7qxXKd4azUKjNas
-TSVkmfKax8Fm7l7/j7EHZ6bywZL4S3m7IjpVLs1XsE7d4Z2vb4R80FB9Is66s2AL
-AAaInI6GEmL/9HvksdkuzyXlNmJSJ+Mqb3gHT3suRSqG+4/LgJ8qpUjwp3rhwnwi
-WBFXHWen33AY5JhZx1qfB7wAhhAZX/dH7xGk+ovlUO0NXbzm3aI9+JRvv2PwuZg7
-Fy5zmRXqON07ORk+DUmJDekjUSaa3TNGI4h56k6bFC120e1dVVKl/q21c6vKH7Ui
-YEn+gJWARoYaxCejwxb+UpSnzJXG2joKlG7Q9IqjBnB+HeJibbvHFdbKnIVCxZAi
-uqY+rGirCSy8J2Sbwti9DSlknuM8//bGpwiuwdGMj+RH1dH3f8uqKORChwbo9S+9
-cEZWd1ZVJCcbrBvC32lQ
-=r/Uo
+iQIcBAEBCgAGBQJOQNhMAAoJENwGBM22xffeWj8P/0nNzBpbBPZn9zFJTQMjwu7M
+unNMx0RIMbhwc1JqRFzbjPLZsKHrBQZviS/Q4Wa5FAE20dcWbnbgxaH0CMLOfLbt
+zSx+k1L3pNSB7ewGG4Rbiw8uLskP5o00e6SH+mqXMUmIcnp1XdFpKR02WFWcnMr8
+gF2LQRGfnBLXoRyPnF+exNL4upoYkJA/xzvrWK1h+epjZssdIlcUq8aqfc//JF1H
+Mgahbdz0bNc7IFSXmv+ntQSr/zpBaFg6HE4gaeXdaJPps6tLlQAO1rqmTV3fopD3
+PKe1AJpJLwm9T4hQ5KJV9TRp+hxss1OpzNrj9Pm4ZeWxNzlZex0+ND3bQhBdo5DU
+S1HOJRuHjPLf06CmaxHvBrDcUFxRmMbVGMCx1uulF33Gdhgl96UiHZEudh8kyONL
+qZGSpmpDL4RyVwKuFfXYgHNWNqEN0xQnnQ4MAadpDxGFsFhpE1Oib5qObyApVKRX
+r7uF6qGD8emAjQS5IeC7SlS6gn63Xv7jir9wVzNKDc9twwkG9g2mkm4zhZMcMKzE
+zT5+jmRndxHwoPxYqg0r9mAzIN8pP3sl+wapX3tnouvHvPAYz/6YNseLi3Uv0yrD
+8qqqxOSdY2i6R5onJgN0UsXeVpLpz4X2i1TbAFAEoN73GAh+YDcaaLvf6kHb9OdU
+xglvEwtk1rZR3pXxkReq
+=/PAe
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmediawiki/files/libmediawiki-2.0.0-tests.patch b/media-libs/libmediawiki/files/libmediawiki-2.0.0-tests.patch
new file mode 100644
index 000000000000..f1437d9cf987
--- /dev/null
+++ b/media-libs/libmediawiki/files/libmediawiki-2.0.0-tests.patch
@@ -0,0 +1,12 @@
+diff -ruN digikam-2.0.0.orig/extra/libmediawiki/tests/CMakeLists.txt digikam-2.0.0/extra/libmediawiki/tests/CMakeLists.txt
+--- digikam-2.0.0.orig/extra/libmediawiki/tests/CMakeLists.txt	2011-07-28 01:27:42.000000000 +0200
++++ digikam-2.0.0/extra/libmediawiki/tests/CMakeLists.txt	2011-08-09 08:38:44.669186537 +0200
+@@ -42,6 +42,7 @@
+         parsetest.rc
+        )
+ 
+-    INSTALL(FILES ${ressources_RC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
++    # INSTALL(FILES ${ressources_RC} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
++    # ??? these files should not end up in the installation! what is the intention here?
+ 
+ ENDIF( KDE4_BUILD_TESTS )
diff --git a/media-libs/libmediawiki/libmediawiki-2.0.0.ebuild b/media-libs/libmediawiki/libmediawiki-2.0.0.ebuild
index 6c4ba8ae436d..8fd900bb600d 100644
--- a/media-libs/libmediawiki/libmediawiki-2.0.0.ebuild
+++ b/media-libs/libmediawiki/libmediawiki-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediawiki/libmediawiki-2.0.0.ebuild,v 1.1 2011/07/29 19:17:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediawiki/libmediawiki-2.0.0.ebuild,v 1.2 2011/08/09 06:48:14 dilfridge Exp $
 
 EAPI=4
 
@@ -31,7 +31,9 @@ RDEPEND=${DEPEND}
 S=${WORKDIR}/${MY_P}/extra/${PN}
 
 # bug 376761
-RESTRICT="test"
+# RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
 
 src_configure() {
 	mycmakeargs=(