sci-libs/metis: Import patches from fedora and add test phase

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

6 files changed, 93 insertions, 20 deletions

diff --git a/sci-libs/metis/ChangeLog b/sci-libs/metis/ChangeLog
index 9168c9c454c6..851f5b0080e2 100644
--- a/sci-libs/metis/ChangeLog
+++ b/sci-libs/metis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/metis
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/metis/ChangeLog,v 1.33 2013/10/14 13:24:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/metis/ChangeLog,v 1.34 2013/10/14 13:50:38 jlec Exp $
+
+  14 Oct 2013; Justin Lecher <jlec@gentoo.org> metis-5.1.0-r1.ebuild,
+  +files/metis-5.1.0-datatype.patch, +files/metis-5.1.0-multilib.patch,
+  +files/metis-5.1.0-shared-GKlib.patch:
+  Import patches from fedora and add test phase
 
 *metis-5.1.0-r1 (14 Oct 2013)
 
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index 205ecc9080de..1fb6a8f9b5dd 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -4,28 +4,31 @@ Hash: SHA512
 AUX metis-4.0.1-autotools.patch 2975 SHA256 0aabafd8b956e8635551750b7ac6ddd8b5ff2e3ba3252f3d0d725c51970466fc SHA512 9e25a7c8c9877c935ec67dbfdfa6d29d25f71c470bdad80a91c8cc1c72652a0d9eb2678ce542a7ef609e57c772e8152e597a207d1b8e89a84aaa92f8ed0cf0c0 WHIRLPOOL fb894101f00a984d28cf01e724761bdd28d3dc37e1407d73cb9be4209cf96668c3157c8a0a8f7522df180231c896201c48f5e5b8e74a071da86db1a89de3bfc8
 AUX metis-4.0.1-gcc44.patch 310 SHA256 b878bbe5864bf70341a388c9157f29ab2e6157d88afec7644b70157e896fa78b SHA512 25deda941de6d0fc13199cf609f5f2cafcf6ae9ff9e4c6bd898314d73de01b12f1036b6617a741ab212aa2a1c6efff3a1f0e7a139ef2e055f733f60c36adfb19 WHIRLPOOL 3ed58b2144d12c28912b0b66f46f362903d64a392a94d9337fe98a7f85d6d4dccace824edb465b391174d04993c92f457bac89fe78ca8ea981d22f2bbec6b8e0
 AUX metis-5.0_pre2-autotools.patch 5206 SHA256 506efdedb531d9fe88f2d0fced952adafb139820aed8bdd9618ef09fb7dcf71e SHA512 6840173bdef8beec1b9150986f314db576f170fbab5f3347caf2836b5bf6f69db36cb527ddd506e0388ee7c1ba0489a6a97ce0405fd19e2d65b8eb0eb308e0ea WHIRLPOOL 313639e94bb54c5c873324b0693097db76227df3a05a974f9df0a349d4091fa23e49c8ff24e1ad55fa267ed46c38db881bb5e9480c30d3e57020a579c288c7c8
+AUX metis-5.1.0-datatype.patch 461 SHA256 ce51f314019507f5975baf6eb08ec1e4adf20a88cd804dc22026dbf8a508fa31 SHA512 11e963cae8381aeb4e2b13cb4d2cc1f0236d5d93d000ff3d7f6c4f08742b54632c467a907f2c11cf8e5a33ed6fec1782b36ef4ebddd5603081a8cc884a883e71 WHIRLPOOL 36293c115363237aadb3914212092853ce6763f6cf89c5750a5c2d3d2448aa6030e0803c47f16153a96894ec64999395beb6b624e9bfc99b80eb7740c362198e
+AUX metis-5.1.0-multilib.patch 652 SHA256 4e32f13f20bc7287e9483da592bca226c4f749b37047981f9078f2dde93f1163 SHA512 ab4c522aa97d88e8e10438e33c3b0e86878696bd8c1f2b91cccc2ecef2599ad002ae3202baff21181b0c31962295385ce48111515228fa32f010fe9c6cb39fb5 WHIRLPOOL 3f03ba603a94828f461bff12a6a921e29fae4b6bbfc53816424c033a6c7f06b859d5c1bca035ab21a6007d600c54e8e87ca841ddcab5edcdda2a0289f4888062
+AUX metis-5.1.0-shared-GKlib.patch 663 SHA256 840f46475dfa82baeae177855ae2b0af75f3abd9b984f6082924ce9b1dc356c0 SHA512 46715d88f1626a4412f71fdaec4e1b47e3ad5b02e3c08707084777f495a07bbeccbe47c752b8c99bb0d692eb3281090226e939e2ce1d6e29e3b24b72333345b0 WHIRLPOOL ee1f3392148116842b611d427ba5ab42df50b63a44751236314fb1d54ad173831f1739d78bfbdcc8569161a696648b4589b334c0d5f2bf69ffe9aa9eef47300d
 DIST metis-4.0.1.tar.gz 508601 SHA256 60c792b3fd22684ef16e336d654466753365006b6f9932e031ded79a9b6bd352
 DIST metis-4.0.3.tar.gz 522624 SHA256 5efa35de80703c1b2c4d0de080fafbcf4e0d363a21149a1ad2f96e0144841a55 SHA512 3d1388120c9c94bac6a20e2d38d6022c241bb6094cf71e31decf019d5500d2037716c6d615c5db69b536348a54e43f321c33ecfa25335fa6c84e412be227e332 WHIRLPOOL 0459d9641e5e9cacfb6392e621c42fb382198790c73b09f58fa4a9c1490d98c0baed46be8f7b02b9b81c9f054cff8491d02a38a5ee21ed98c5eba82d6d38a948
 DIST metis-5.1.0.tar.gz 4984968 SHA256 76faebe03f6c963127dbb73c13eab58c9a3faeae48779f049066a21c087c5db2 SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25 WHIRLPOOL 27c7a86c8d31e3d09a70eeea989b7b51e3175309e70513fcf13e00de546148a4b7d696a244656fc514b8c2636fe79b91d0fce29ae35a52ceb059dc831f24ef7e
 EBUILD metis-4.0.1-r1.ebuild 1005 SHA256 e903d8954d469e74fc95dd9cd88515f3eb9887eba7c7ceda911688d61ca2da27 SHA512 ca43391429cba64c076eab1619df5d369aa83817221918602d960be47a6dbae344cc74a6205a77917fad2b50c79648a8df523f7d509be1847ce0bfe08bf863a0 WHIRLPOOL 5bbd85c45ac6be9499355cfeb7815ef62a4a5772786a33b75afbc0a2bd24f7ef3948ec9f7b425171cac19f24bd058b987d671adf5e102fae23470a87c4f33237
 EBUILD metis-4.0.3.ebuild 928 SHA256 f9f8acdfcb07d48775056e55b3bfba5a0148653a795b2f7427047eb1ff3f3588 SHA512 18799de770badf6dc3bf1f655fde7e386e16b556ff481d5dc9b807fd4a227f772a3ad973c69446bd8fd142fc6b7220f53a475db8a8f77cbe6e837e9de5734471 WHIRLPOOL 4b03640d7507287364c065056143471333d6b2932dbea8250915a05f23c8c0253b9dd8895529f9e56d9bd5049fc26ab4fb82e04d9a8e96e6fb52f87b4caccc6d
-EBUILD metis-5.1.0-r1.ebuild 1468 SHA256 fdb5326a90d02955306ae2ba463442438725f7ea179353af35756f8cbde8ddf7 SHA512 bf64d8b8cf053dd199977272fcd929833d4121cd54e3afbeb6c3d3f971be87a5e50729e4d7116fa14782e8b74f0c01a0ac66e3d3e9af4725c4b0e704c939cec8 WHIRLPOOL c60d6874f101d7278db8905a719cd16f82739adbbbb8ffcb17e542cc9e07477be010b09340b44b4492547b56b91ae64a11c46c5fd99501a0e72505aeaf02581a
-MISC ChangeLog 4721 SHA256 d0ce33531c9da72198473fa1fa72ce482991de8507d61a3a024d20ebeeb68f95 SHA512 469c96eb9c6e165a64548847c7e541b289fa08e2b1975c02e8514ffa22214b23054cad265c2458189745d6805dcf122bf293c70df086501150ea017f12a79b3c WHIRLPOOL 7bded71e6088a9d5c3837f2642e5116c4581375eb041a7f9a55f22d6c069092fd26db3ec7389f5e9d248b54b6e9d79f58fd6281a45004e10a7bb6d3d5fc46d20
+EBUILD metis-5.1.0-r1.ebuild 2062 SHA256 261af4df0963e4c990ac07414623c97bad3718af398a83aaa5830418edbd2583 SHA512 2073ce45e025d23bfb15c7be812042c95d48b0cf8010afe43a9bc7f83e8853f52a0578e180b08e4ecb2c0f5012167d3326aff79f0e3d2ae839a777c8c40379c4 WHIRLPOOL ae25a629c7d47e2b021d869299386867b2f70c4c850e6cffffc28b578ea2506ad744b281f628da4ab465f20d20827037890e6c58b0d0a9b52d7fcee713de4558
+MISC ChangeLog 4953 SHA256 675331be27721bea3495a0912d5c67daffefa346c99ef443ab4fd2f96d468f44 SHA512 91a10197b3efaa1bdf45abcab5b0279cec9658a1938949869ecc87e219f63fa5c9290eb29d5fc7ff4704a463348c1665c3f82dacff9d629f461d3ccd35e19ec7 WHIRLPOOL 58c620449852c4a1ec578d78675664b83b20d362a9a9965d9936f2cc7d99ed99966d585242b038a4385607d3efe5fea405e9c79b7d3d7172db560afef98b032c
 MISC metadata.xml 517 SHA256 e67d9389c0b6fa8d6b40cf5f7d9b13152de8789c6c536dbe88179efe564a149e SHA512 a0092c4b8ae8a22107d1b25a42b6b85c0c586975ba3f2f77aa69eedba0744aa40824718995a62b862b59741928bd42c3411d5471327145fd5d910bc28d1615ff WHIRLPOOL 316e6fdea93bf049dc27e9f3ebf614c29d9b907ec0b67a03f1c1bec891e8c3a3c700563b4d36092260e9894a2c897e0af071306ac3fa3db372a8352b9e5007be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSW/CoAAoJELnU8jG9FVirKogQAJ/QR0afCL/yXXN8zKKAasoD
-cQKq3K+/5SVo6R+5SKA4ze9t1UfG/jCCc/UNhfvslCXqec34N4D7iR2TM9rjh5A7
-3ZUjI3kMHUTVwfzc8fBxdrRAn6brabMQ4hVaXFPiqUu0OCPdMg5asWSOZfaQfaXD
-QFTgk1XycCwApEC2vvxJqkktDpTvhS7TV4IdhcBavZrslOJrg1QpXsAwRzFhUJ6h
-A6driV7QnGbo1YKkhXIKnRz4psu4+RD5UAYqb3qq9s2mzuqmJlSjspHzZi2FRK0x
-8rT1G8O3Uo2qJNAJFt2eb8MGgEpFzUClFiYqEeZROHgTiw2c1W6SW8mYMZ33mYZz
-P93YWiEaDSTfBni+yM8czVe27ZRcPTDhx08cNGfbvFbl3YVOvss5YItjp51q/uYU
-MctBtr50V+tt9Mvd+TcTFgAq4wYcoNe/Mpnwlf6av4gzTmna/7YNnTC5vuD+ky5D
-e0MbtnyplivOwhDfIU2yw5U0WUEi2lU3dOXXtJ2D16uC0J8Vu+Wb8LMJ3Fn31gCA
-PIUfdx27cmZR8qKCMJX5x1TCxwXuAJUbCZJd3+RtLSeAohbfa1sI1meS1CyXXOI7
-V/fvo0Ga+KinGW1yvol5cOhSf9wDvvn8kcHslFxC4hr7KaaMmhqqJEB2avtEVz/m
-ngz8+ZslhS1zGAv9KNB1
-=GbFM
+iQIcBAEBCgAGBQJSW/avAAoJELnU8jG9FViriGYP/iImf6tRKp23vye05kTC18NB
+39nJwzRJPuZ5/kWUJFXQXABqTN29sPGVBQUW+0uZQxq3MuK7vgTXvKoQSj/HB9yd
+OsJkosgKmSm3VHwJZyUzHM3kd44+nMSyx6RD7XxeADAV0G7ImBDeWCYkv8ftHDtP
+gQhgxXiIzmYArHaUcK/NrfFdlc15Iqht2Sf+9ccOhVdmgxVlx/TJDbweUvVIoLGM
+pWF4JCO439UB7W3JyOI7kQdrIeuM/UDWxSK6ELj8nmAg8bx6/j8Ra6yS3agIsMcG
+po8KxszGB6XKhjRil1LC4Y3FChaCoYMOE/WWJ29UlGQy2MIj3DF3Lf1dhymyxDey
+QFnDydULXlJwdP2D+NPhjUYXH1msGbuiBLgKa3FDAOmKxn/JjFWtI/wL5xqYUL0X
+oPlCkxEdkjeuiCfon/FdhEg5IH+Snf+mPYMsYTlY1DPkxu7f/XRsrpOdz5kuzBCv
+9rrlyQumHpcswRSphFLA4dHXscl6M8RlZIFO19pfSVDPj6bovIYUUpd+dfWLnF6X
+Q0qfWBHmZGXZJ12r0+HDT4WNNjX8HDPxYcDSTsXdB47jyALp11PXBEVLv5IE400r
+8lUjlIHZ1Q4o1MbbnS8Y7GDAF6GZkEsNqDZ/9C6zc9M4nYKDNNf5VYek9UXj4OOr
+D7eLEReBSSC0OITF3YY8
+=CTLA
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/metis/files/metis-5.1.0-datatype.patch b/sci-libs/metis/files/metis-5.1.0-datatype.patch
new file mode 100644
index 000000000000..f583d05f34d9
--- /dev/null
+++ b/sci-libs/metis/files/metis-5.1.0-datatype.patch
@@ -0,0 +1,12 @@
+--- include/metis.orig.h	2013-03-11 20:50:00.000000000 +0100
++++ include/metis.h	2013-03-16 12:14:59.117329640 +0100
+@@ -30,7 +30,7 @@
+  GCC does provides these definitions in stdint.h, but it may require some
+  modifications on other architectures.
+ --------------------------------------------------------------------------*/
+-#define IDXTYPEWIDTH 32
++#define IDXTYPEWIDTH 64
+ 
+ 
+ /*--------------------------------------------------------------------------
+
diff --git a/sci-libs/metis/files/metis-5.1.0-multilib.patch b/sci-libs/metis/files/metis-5.1.0-multilib.patch
new file mode 100644
index 000000000000..919812dc3093
--- /dev/null
+++ b/sci-libs/metis/files/metis-5.1.0-multilib.patch
@@ -0,0 +1,20 @@
+--- libmetis/CMakeLists.orig.txt	2011-06-22 19:47:13.000000000 +0200
++++ libmetis/CMakeLists.txt	2013-03-15 17:13:19.948911972 +0100
+@@ -4,13 +4,14 @@
+ file(GLOB metis_sources *.c)
+ # Build libmetis.
+ add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources})
++set_target_properties(metis PROPERTIES SOVERSION 0)
+ if(UNIX)
+   target_link_libraries(metis m)
+ endif()
+ 
+ if(METIS_INSTALL)
+   install(TARGETS metis
+-    LIBRARY DESTINATION lib
+-    RUNTIME DESTINATION lib
+-    ARCHIVE DESTINATION lib)
++    LIBRARY DESTINATION lib${LIB_SUFFIX}
++    RUNTIME DESTINATION lib${LIB_SUFFIX}
++    ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ endif()
diff --git a/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch b/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch
new file mode 100644
index 000000000000..acfa59e60bd3
--- /dev/null
+++ b/sci-libs/metis/files/metis-5.1.0-shared-GKlib.patch
@@ -0,0 +1,21 @@
+--- GKlib/CMakeLists.orig.txt	2013-03-11 20:50:14.000000000 +0100
++++ GKlib/CMakeLists.txt	2013-03-17 19:53:44.220827579 +0100
+@@ -7,7 +7,7 @@
+ include(GKlibSystem.cmake)
+ 
+ include_directories(".")
+-add_library(GKlib STATIC ${GKlib_sources})
++add_library(GKlib SHARED ${GKlib_sources})
+ if(UNIX)
+   target_link_libraries(GKlib m)
+ endif(UNIX)
+@@ -16,6 +16,6 @@
+ add_subdirectory("test")
+ 
+ install(TARGETS GKlib
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib)
+-install(FILES ${GKlib_includes} DESTINATION include)
++  ARCHIVE DESTINATION lib${LIB_SUFFIX}
++  LIBRARY DESTINATION lib${LIB_SUFFIX})
++install(FILES ${GKlib_includes} DESTINATION include/metis)
diff --git a/sci-libs/metis/metis-5.1.0-r1.ebuild b/sci-libs/metis/metis-5.1.0-r1.ebuild
index a2b2adf7ddb3..d71bb543611b 100644
--- a/sci-libs/metis/metis-5.1.0-r1.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/metis/metis-5.1.0-r1.ebuild,v 1.1 2013/10/14 13:24:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/metis/metis-5.1.0-r1.ebuild,v 1.2 2013/10/14 13:50:38 jlec Exp $
 
 EAPI=5
 
@@ -21,14 +21,17 @@ RDEPEND="${DEPEND}
 
 DOCS=( manual/manual.pdf )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-datatype.patch
+	"${FILESDIR}"/${P}-shared-GKlib.patch
+	"${FILESDIR}"/${P}-multilib.patch
+	)
+
 src_prepare() {
 	sed \
 		-e 's:-O3::g' \
 		-i GKlib/GKlibSystem.cmake || die
 
-	sed \
-		-e "s:lib$:$(get_libdir):g" \
-		-i libmetis/CMakeLists.txt || die
 	cmake-utils_src_prepare
 }
 
@@ -41,6 +44,15 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_test() {
+	cd graphs || die
+	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib ndmetis mdual.graph || die
+	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib mpmetis metis.mesh 2 || die
+	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib gpmetis test.mgraph 4 || die
+	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib gpmetis copter2.graph 4 || die
+	PATH="${BUILD_DIR}"/programs/:${PATH} LD_LIBRARY_PATH="${BUILD_DIR}"/lib graphchk 4elt.graph || die
+}
+
 src_install() {
 	cat >> "${T}"/metis.pc <<- EOF
 	prefix="${EPREFIX}"/usr