sci-libs/xdmf2: Install Modules correctly

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/sci-libs/xdmf2/ChangeLog b/sci-libs/xdmf2/ChangeLog
index 5ea220bc785a20d97ae0879119a7fed5ede6ab36..60845f6bf62ce9efdb107bcf7fdc11ddc3e22fb5 100644 (file)
--- a/sci-libs/xdmf2/ChangeLog
+++ b/sci-libs/xdmf2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/xdmf2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/xdmf2/ChangeLog,v 1.1 2014/12/26 14:33:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/xdmf2/ChangeLog,v 1.2 2014/12/26 15:55:21 jlec Exp $
+
+*xdmf2-1.0_p141226-r1 (26 Dec 2014)
+
+  26 Dec 2014; Justin Lecher <jlec@gentoo.org> -xdmf2-1.0_p141226.ebuild,
+  +xdmf2-1.0_p141226-r1.ebuild, +files/xdmf2-1.0_p141226-module.patch:
+  Install Modules correctly
 
 *xdmf2-1.0_p141226 (26 Dec 2014)
 

diff --git a/sci-libs/xdmf2/Manifest b/sci-libs/xdmf2/Manifest
index 03e3f8f78fb7fde25dc51959f4be2dfbd70b2349..c76f1367825c6bf0d9bfbaaab334759f5060a6bc 100644 (file)
--- a/sci-libs/xdmf2/Manifest
+++ b/sci-libs/xdmf2/Manifest
@@ -1,26 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX xdmf2-1.0_p141226-module.patch 452 SHA256 8e254633cab00c1835e0c594c90ae89b405ecb703fffe8a501c487fc0b39f4b2 SHA512 9a9e05001f1d8ea8250a7bb9231a43e8cceeface61fb125330b6255a1ba452650a80cb6592a69fdecc04212752c0d1fa195151b13c88262c40a36ca566a33dcd WHIRLPOOL 476e0b4ac6e216fd678f24f78c4c534d81cd7ff28a3163aa6a4b6bc5b99344f0e5c6c9356cedbf2871d272a6b4e1d1d37cb6365c58286a36838f0433a8328ebf
 DIST xdmf2-1.0_p141226.tar.xz 267096 SHA256 9738bfb5d9ae92b885d1543f02ca4ad34f8eb71e6a697980465f40bba7dcf7c5 SHA512 031b947ccd942c39cb40504e939f03bc9e3190ae1a7baf8325809decf70a040e860b43d5bc9debfcf2f3838f5f0d7a9c77c92561c89fc0d632306e140b136db9 WHIRLPOOL f6698badae43d1710ee4642139ff6bc3ecd11424c1d1b72a09a4de2c10edaafd213f0b0773fba133067607c6eba08b39f38d82eef3bf94e709c8dd3257ca09ab
-EBUILD xdmf2-1.0_p141226.ebuild 1391 SHA256 8c7f890fe965df92204c6d675d216c0fbbb45f635674121fd7a8d12c00afc512 SHA512 af5b7c3f617155d6f550600f819472913c6d7c5a81c001f7f5b3fb8b7a0d6621fd7315aff4336cc8a9e23f873cec79243e452c525171803edb1d2e8b38544865 WHIRLPOOL e6cf04f8398221fd978dfcc68b947353fe126c21a5afe240e819a28cffee06fe37832df1db9534aaa91038bf35cc5f1eded805210b62488f8c44447ce7c2b78b
-MISC ChangeLog 353 SHA256 0b5e67d4cb3039c7ab534388d882bc6dd38505cf762a20b8ba21af32bb7ff933 SHA512 02c5bb371ef55bf35ede984bccb4be2cb6e7f88ba1759fe91c92bce2cdf6d759d3eb645c5b0213b663c89a6f9944e100685d5ec929f95d241f952d29d7d7a5e1 WHIRLPOOL 298e488d4e47dda2ff70595910245263889c1d7d94cba611b39aad771240dcfec7a2917664a70f64ecce5c0a74ea02278aab54b97d2bf7f873dea853fa3fe4f1
+EBUILD xdmf2-1.0_p141226-r1.ebuild 1550 SHA256 0842df38ec008350fd6c08c9ec3e9aea6bb3c85bffe11cb3cf58a6c2f2c52bb4 SHA512 0d2f4dc71ab68e398beebd03ac670e2e6db48c5b39819160aa679d57bb7e0348fbb25aa2128974d2bd6be7d43f094740809214543b3b224a15f3bdafc7238f5a WHIRLPOOL 8fa458fe04871f51c94c5a3b927abe5b35e705cb26c073ffb86d6a018a05ce4a265c3474cdb3146b529e13062fa9ef421957e40b7c1a5b689755de12952e985b
+MISC ChangeLog 564 SHA256 b3e1bb2ff3fa3cc31221c7abc67bf1e2e29dbd584f8fc34f93951724dd141fd2 SHA512 5aba9ca2c7f92c3722f3d720e303dfe5ebbd2e76427669797f45dda637bf8f5b46d96adae74e7e26dab212335fb3cbdf1151665ed906352150ce4e137f041a35 WHIRLPOOL afc2d10fcd85fdc83f3dca127750121e2d9a331393cb9453a0df52f5b302c66cb22b2353268f675ad6636b3f6ed5a5c502f0d15ba9e83dfca6e9aed4b2ff195e
 MISC metadata.xml 236 SHA256 feedd499ae6ddebc364ebb0f38d08bfbcc6b5d499f805a307a9367fb82dd12e8 SHA512 02882c2ecdf4fe400bf3e4455df1feae173e12b6fbb09181ea50541bb9dbf43780a0ab00fa799ccf5b7f2c27dcf9d854e16146cfb336ff3270a7b4369e451860 WHIRLPOOL b6580a9428931142ea961e985e6b5c736ab716eefb85706692c780c11f97d6019be488493c2e2a51b7ae8b480be80276edddb2858fe19684d48df64433475e06
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJUnXH8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirq9cP/110biZu8REMz+GM0UGqEcYJ
-OANG+pI/6t1lfDsTbzhZ6iwvNoTfyhQla9o7bECWFzniU8fuK+kTOEPMS4nJGlWH
-CJ/n/LS/UgqP9ZpeV0pff0CGRgXsm/zTOmXzm7nCWx1OwlGnDDHYZhUUUkHv8vqS
-GNqvkMMHgE0lVJMh1jLUWAagbIqb/njYj8kZX7L/gFAb1TENXjxwVFpXjCFgntg1
-/vBwDucjv4ZGPMnXXsZpRLqG3WZ66vU9uAR2vdMxRWU0B918EwwY7yAPT72sYK1t
-B5ECLPLEvxmmBdy8q1EUYcjuQvNTYnMZJ99RLDdYaitJL85jVzpMZxXg1b2a2lPC
-gs1+GGBeOM27bO6AxHPVh+jVGCSWt5I76jkl2/qu6mjUzBZbi/wJ8f+LQvAkzL20
-YLBSRfzXq/meco5+KSBUTyo0PLVQYhs0zf0tek85fuT+WRZ7meTe1YeKeZuPxn+i
-ki1Dcyzgt2byqiS7Piawy/Vm3zGx4zIguaZIQijEUnzpeu5DAiaKMNzW8TY29cnF
-n8Ra5u1NUzmRMeDee8JQZhbT7rBpJxOMg6ucy4lejtxp21CfG6POtHnEy5e9P6dq
-yvYUx7dZ3SsLVdWDS7YScYYPtP8PUJRIVqZvx0jjDS6PgYjbgWpHUAezdJcHYINL
-k7rksaVOE/C+AuHurnrW
-=ei+u
------END PGP SIGNATURE-----

diff --git a/sci-libs/xdmf2/files/xdmf2-1.0_p141226-module.patch b/sci-libs/xdmf2/files/xdmf2-1.0_p141226-module.patch
new file mode 100644 (file)
index 0000000..c337ca6
--- /dev/null
+++ b/sci-libs/xdmf2/files/xdmf2-1.0_p141226-module.patch
@@ -0,0 +1,13 @@
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cef5909..46bcb88 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -346,4 +346,4 @@ endif(NOT XDMF_BUILD_CORE_ONLY)
+ 
+ xdmf_create_config_file(${PROJECT_NAME})
+ install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+-  DESTINATION ${CMAKE_INSTALL_PREFIX})
++  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules/)

diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild
similarity index 86%
rename from sci-libs/xdmf2/xdmf2-1.0_p141226.ebuild
rename to sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild
index 7cf3a72aa68c0d57f1941d0b74cec64c44cd9b06..7c2fde07e691163fdcce2d375f30dffc6b9dfaaf 100644 (file)
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226.ebuild
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/xdmf2/xdmf2-1.0_p141226.ebuild,v 1.1 2014/12/26 14:33:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild,v 1.1 2014/12/26 15:55:21 jlec Exp $
 
 EAPI=5
 
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
        python? ( dev-lang/swig:0 )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-module.patch )
+
 pkg_setup() {
        use python && python-single-r1_pkg_setup && python_export
 }
@@ -55,3 +57,8 @@ src_configure() {
        )
        cmake-utils_src_configure
 }
+
+src_install() {
+       cmake-utils_src_install
+       dosym XdmfConfig.cmake /usr/share/cmake/Modules/${PN}Config.cmake
+}