diff options
| author |   Slawek Lis <slis@gentoo.org> | 2015-05-06 05:35:29 +0000 |
|---|---|---|
| committer | Slawek Lis <slis@gentoo.org> | 2015-05-06 05:35:29 +0000 |
| commit | 9e39d3d2e76879a39966799ec143815553050d04 (patch) | |
| tree | fb482b9d7e04866b8a81ada5c56021e1668f387f /sci-libs | |
| parent | version bump (diff) | |
| download | historical-9e39d3d2e76879a39966799ec143815553050d04.tar.gz historical-9e39d3d2e76879a39966799ec143815553050d04.tar.bz2 historical-9e39d3d2e76879a39966799ec143815553050d04.zip | |
Trying to fix name collision (#548716)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x55265D89
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/libgeodecomp/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-libs/libgeodecomp/Manifest | 19 | ||||
| -rw-r--r-- | sci-libs/libgeodecomp/files/libflatarray.patch | 11 | ||||
| -rw-r--r-- | sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild | 13 |
4 files changed, 43 insertions, 8 deletions
diff --git a/sci-libs/libgeodecomp/ChangeLog b/sci-libs/libgeodecomp/ChangeLog index 90946ed97075..c3f210c8ddb1 100644 --- a/sci-libs/libgeodecomp/ChangeLog +++ b/sci-libs/libgeodecomp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/libgeodecomp -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeodecomp/ChangeLog,v 1.1 2014/05/19 10:42:34 slis Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeodecomp/ChangeLog,v 1.2 2015/05/06 05:35:19 slis Exp $ + + 06 May 2015; Sławek Lis <slis@gentoo.org> +files/libflatarray.patch, + libgeodecomp-0.3.1.ebuild: + Trying to fix name collision (#548716) *libgeodecomp-0.3.1 (19 May 2014) diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest index 6ae4e5f83e78..0d002483c941 100644 --- a/sci-libs/libgeodecomp/Manifest +++ b/sci-libs/libgeodecomp/Manifest @@ -1,4 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX libflatarray.patch 528 SHA256 5858f66ba36289dd0247a70ed2ab26351137f06463ce2331a56a09107a202f12 SHA512 e3b195723999285fa14702e01497485f55e8523883951db16eb883220cb636d3f20f3df776b1a0dff70da221dfd7483a032e08b2996e94fd642fa175f69cc627 WHIRLPOOL d797166bcdbaf987b58288f29ca1f61c7106b6f9a05158a9e2ae7f8dd0a2bc62b0242bddd20a5795d5e4416ea64dcc35cde3881e43b095d4285df18686fe275e DIST libgeodecomp-0.3.1.tar.bz2 740341 SHA256 3c49a238472a82be3a6e2411a20bda85672aac01d4a87bb0e63ccbff1385ea64 SHA512 28f0ea04e45cb0a5b81b18efd3e3a011d58c077562f8039ff42e701cc362f86dff90bd505690ec22c8a42e9de1236d5b6c61d288ad4c154289e92700a2a7fcc0 WHIRLPOOL 3827974861556ab84a16e81b8cece2cff4d9e88a1559d99192fa47efd571639b252423038b3b579811c7d57452e94ae96b99f7209e87af46b752b5a193dc9994 -EBUILD libgeodecomp-0.3.1.ebuild 812 SHA256 67b2a204eb16ff9e405cf7f0d6968c75fa746175b4a5f3e94c61979399633771 SHA512 d3c01af4312517704d24f48176b2b73c1f7645aba674a261e7ab71af4e4c910c5905a420e3c45d42ce4cc10f94600fb5139cb9305f315d4b690a76a0978d7894 WHIRLPOOL 33806935fdf01c69d5161aa5e31c00e71723d05a59e53a6af124a4eb938aec27ffdb3edff85039c3eb5e834ba9d1bb52b7a414c69ad098ee28f93b856513415b -MISC ChangeLog 366 SHA256 f60fad759cf1ac2fff3ab517eab9d4ab5a30d50a8b3aac369a2ae322a4b32a72 SHA512 eb73e14a45be029ef568d571f73ae4cbb91e2e2feb2f35d87e86c5d0dfa565c8f9ecfd4373228aa58ad245ec89b4b3ad54630d9a1a6eff1e6ca8c876391a407f WHIRLPOOL 3e79f8f0673dc02c169be1093cd6696701f333f744759fe0dba464ca9b72c4e7321efefca0e8700d85ff7875553a586bf4cf732ace6f301cf9a4154b5f8d8a05 +EBUILD libgeodecomp-0.3.1.ebuild 889 SHA256 a4d8a7fdc584300649df518ffadd8ec020e8e7387ade7fdb02ac81f8e55d2f59 SHA512 f4d50e521476439d8886233943292995f44e96251e14525fad8f3628fdc529645ff6993f1039cba54579ff591a264eed5fcb89bde6d430401b2f6e0ef4c86e62 WHIRLPOOL 2a9c0c125d4729344299e4d794d97e9d03c33329bba58e961b3daae4178475926107ff00e1e33202363ec9e97b9050a93f594151796142321d1084b07bb6ed0d +MISC ChangeLog 509 SHA256 5b81c6d04f6a96e40f434b9378b18ae470f4b5c04ea670d2c67a5a1ec6ebb9ab SHA512 8d1de0c428008effa87f19705f81139bf05dd9c8a4605d98de2274f66f98d99355208f2a303dc6cd65c486f4546864a39db358b7265fd59ffa06ba329e9859b8 WHIRLPOOL 224a8b9d224debff3ed4c80867130a4b4424069623e3ab2d222bb8fba2a56f6e9ab5c418d4e62d8e30bba287b85db3119df95943e07d7c2b18d26753342bfd6d MISC metadata.xml 205 SHA256 132e3db1188fcdf8aa6467bde8677e24fc63015666de6104a656a5b074932454 SHA512 e53c51c47b6f2ba5302d5fe6ee9524fe49c69d2b03d66aa0a3054185c7c0a83dedeec75ea15424afe22f1423d72c5bbc1c1e07c6bdbdd1912d8eb8e046a4ef58 WHIRLPOOL 5f4c6dfd2f9dae15971877f2eb53c1d9f6196a42dc62b2d95ffd2060f119d7e0794541b3d8ca565f9ca48479325d19864f74a85289c83d5a5e2396f9144d161c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAEBCAAGBQJVSacGAAoJEO1RxJ84ipLkKO8H/j8OjuE+clOIic9wgRA4mB27 +VNR9PS3lOs0YsU+Jix+ZOkL41Lp+lADbs/LHyJ7oXYraszqDcvsCdGIkYWK6yxXt +7t5nXRXxBQvfmnLn8eD99/LmCBUNdwXITSw8bUN81fQq7nAl2F3VbNC4dgQr3Vbm +zVZ9v4yiO6YK+a96bA65bIRV+RNcm7K4Xjjurqio3CUhaf3ac5V2XHVXmZ/r9rZ3 +29AjEHnMWgvsQcRwa8weHAZUiikxzopBGJO2R/qeSpSTfy7gi9SVnozAg/xRXPUb +DH4XmYP2L4F3gUBgUEsLwdYuk78Z1kHDMJYzRdFLk6+wgs7e0/Pl0gKhmtVcKQU= +=cQJv +-----END PGP SIGNATURE----- diff --git a/sci-libs/libgeodecomp/files/libflatarray.patch b/sci-libs/libgeodecomp/files/libflatarray.patch new file mode 100644 index 000000000000..8a109d986577 --- /dev/null +++ b/sci-libs/libgeodecomp/files/libflatarray.patch @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2015-05-06 07:03:21.508147301 +0200 ++++ src/CMakeLists.txt 2015-05-06 07:03:27.038147363 +0200 +@@ -439,7 +439,7 @@ + install(FILES ${HEADERS} DESTINATION include/${PACKAGE_NAME}/${dir}) + endforeach(dir) + # install libflatarray, too +-install(FILES ../lib/libflatarray/src/flat_array.hpp DESTINATION include/libflatarray) ++#install(FILES ../lib/libflatarray/src/flat_array.hpp DESTINATION include/libflatarray) + + # link against the libs we need + set(INSTALLER_LINK_FLAGS "-L\${libdir} -lgeodecomp ") diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild index 6493c4c5e480..343045e35001 100644 --- a/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild +++ b/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild,v 1.2 2015/04/02 18:32:07 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild,v 1.3 2015/05/06 05:35:19 slis Exp $ EAPI=5 @@ -16,10 +16,15 @@ KEYWORDS="~amd64 ~ppc ~x86" IUSE="doc" RDEPEND=">=dev-libs/boost-1.48" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-libs/libflatarray" S="${WORKDIR}/${P}/src" +src_prepare() { + epatch "${FILESDIR}/libflatarray.patch" +} + src_compile() { cmake-utils_src_compile use doc && cmake-utils_src_make doc @@ -33,4 +38,4 @@ src_install() { src_test() { cmake-utils_src_make test -} +}
\ No newline at end of file |