diff options
| -rw-r--r-- | net-libs/libproxy/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/libproxy/Manifest | 15 | ||||
| -rw-r--r-- | net-libs/libproxy/files/libproxy-0.4.10-cmake-2.8.10.patch | 31 | ||||
| -rw-r--r-- | net-libs/libproxy/libproxy-0.4.10-r1.ebuild | 5 |
4 files changed, 51 insertions, 7 deletions
diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog index 342889d3e661..229cbf6d0bae 100644 --- a/net-libs/libproxy/ChangeLog +++ b/net-libs/libproxy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-libs/libproxy # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.96 2012/11/25 19:01:00 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.97 2012/11/26 02:40:55 tetromino Exp $ + + 26 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + libproxy-0.4.10-r1.ebuild, +files/libproxy-0.4.10-cmake-2.8.10.patch: + Fix build failure with USE=mono and >=cmake-2.8.10 (bug #444204, thanks to + onip and Chris Reffett). 25 Nov 2012; Raúl Porcel <armin76@gentoo.org> libproxy-0.4.10-r1.ebuild: ia64/sh/sparc stable wrt #442152 diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest index 50b66b25a409..0ce377d87e2f 100644 --- a/net-libs/libproxy/Manifest +++ b/net-libs/libproxy/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX libproxy-0.4.10-cmake-2.8.10.patch 1279 SHA256 6a0fa494c384367c59d5931836de9f44cdf0f981b06ad6a1738d72858db96b78 SHA512 e9deeef1650639e7d278c6ccaacbee16c8d412d944e24bd067526da92a5ee69c6f41906cac3557b8b8e856cc0e3640c7f411cb12df236a8da0f8df4923d3e500 WHIRLPOOL d95ae9778d9fee18723c205c6f862cc7e861af04652e79814d029a28e00dae7a60b9c9ee6c91bb6c4091a240fef19ca687410290bc4890247a834530390aabab AUX libproxy-0.4.10-disable-pac-test.patch 1017 SHA256 5aaf8c3795b8377e4e71137db2e948de98680288a1fdf544d31d9086c980d9e0 SHA512 a0fa6520c60489675176ca7d5d750d0f54e020592743a3437c184939314b71be68803a7f1cb8cb584fb7ad6ee884c85bfb7905d4bb3e0536d535e990981e9ba9 WHIRLPOOL 09889493958b9bbc0c3cd160d84512955cb63f925edffc7caf827ffe2d5f6c1ff7e3a5de32e842b642e11fbd813194656bba1d597140bee0d759836e0021ec80 AUX libproxy-0.4.10-mozjs185.pc.patch 884 SHA256 bd6ceb23919ee6e7619a90bf9aac9295e7904c310e876f64b3bac9aff3d0a5be SHA512 e626d327dd7f681049442e2bd90fb76e2e8803d0ebe94944250a61aa7672259241006f0f71320693701c131855a2f9b40940e84024b92867d81600ed2a0a9848 WHIRLPOOL 48f9c1dd920ec777558ad6b38506cb389721d7cd4805190b2f038d70262e1cbedd2f66fd569dabdb2cec0b3967fbd868d3da376c36d4c2ea73e7b60edc773fb0 AUX libproxy-0.4.6-backports.patch 5508 SHA256 d549840659c19a0d39d208928c1fe67aa7cffec9448b3c123951d3ec59049609 SHA512 0bbd39482a1ee7764addec5e0b460c6f646f4b3a30fec254b38792d7e9effe19c455bc09853e4c9ef7f1ea03b669156aecfbcb7377985e3ecce1184148031cd6 WHIRLPOOL 78b3c80650fbac613b3f4b647201c019bf59a369ee62264e6de5ad86ecefd2ab664096a9e73df3c7ffaea5a56c05983f18f1bbe853f6e3805bff75144b670a41 @@ -11,16 +12,20 @@ AUX libproxy-0.4.7-gcc-4.7.patch 2740 SHA256 ab7e1a21a884abdf6192718c5fe53c79feb DIST libproxy-0.4.10.tar.gz 378318 SHA256 023e3c1023c522333ac4c414e9cb6db05bc564d3e5d30570e2db07aac100c635 SHA512 d7400740290bffb66ced317692f6b6fdb3e9973e48af1287df51dd3813706164ac6ee6970bde0f7b28beed4a6b6086bf957d85ec8c543e4c0af7044defb88e82 WHIRLPOOL 9dc72362eddd2152a3dfb0185ccdeef4cdbae5c500a18d4ec64bfaacfb4ee66132c0175d837b8ed88cb210a35753546b06735a33a85f3fdd5bf12d5e71b57b06 DIST libproxy-0.4.6.tar.gz 82483 SHA256 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30 SHA512 4ed64addf5a41b4c0e24cd0988707a73d608d57833d0f7da955bcb9a567ec8fa37b7407c2e9c2ff50057a24b56d17509c944325d2d1d8b7e5e6aa64e624fcd88 WHIRLPOOL 8f32238b57f6b4c142756664248d0449e292fb44a940b059bffc7c9408e825ed96a1dbe2f0e8c3a8caaf059449225999d7ec966812b54ad6b84037b83767c132 DIST libproxy-0.4.7.tar.gz 91092 SHA256 8fe0a58810139ba3c2e186deccf3e68adcd127aa0e972b0862b30b3dde493797 SHA512 a0a5f4f8faa2724ca88fb52f3f683f7270235536151089bfb34dd0f4164923abc586c7b621eb70bf0f53a0bf5a9807d3b31061803a0891c70d8e6dad1bbfe48d WHIRLPOOL 665486341b517c324c15a06f37366b834b249b1820cbac6bc0aa39586b9933e0f6519e4963790ce0992eed95dd46bc965b76e2832e8ec4eaddb1e2e4e3e0fa20 -EBUILD libproxy-0.4.10-r1.ebuild 2396 SHA256 4602527e5c90c8ffe419312a5f571e52115dd31ee9b3bd69eae8fe57b1ad6e5c SHA512 1c3a30f1c09a8451e7b376e818200d06cfc134fc7da8abc7e9872d99e84d18599fbe89705d1eb9266d85e05d6c5cdb62bb1dfed5ddfaa981a183279020db7abd WHIRLPOOL d6b7ba6337fd49a56e6fd374485f8828ee36d7e5645c59c34ee504e4750fd4969eead3d236f22936fbe03592f07998fac87fb12c94d812032bcca8753708d5a4 +EBUILD libproxy-0.4.10-r1.ebuild 2522 SHA256 682d6d580794f4824521de08c413b4aec96af03c15b82dde1060c23199e3b53f SHA512 a23e82c701f36f2ceb81457172ef54c9ce7ea6161e7b1a593637383efac42bc0dd8907699898e1cc2294edc07d894f0a7891924cd6f5c48bf0bbbf9c9e7935af WHIRLPOOL 04a3bd663d7625050b9d260f55164cd29a8e6b0d8f20c6ae2d9f31ac0a0aabeacfb6f6a933e77363bcc19821d8c1e108138eeb316192254a4887e44a7a70f20d EBUILD libproxy-0.4.10.ebuild 2371 SHA256 9dc0d1f254e880627d46261b7592562cb93e9e93abcc0ff5ceb75c50f32248af SHA512 75fc1117599e0f0e5f3a3bae6cc683222b6e2d206ec1a4228eeb9e3b3d4872be4e84942f6b500ed2aa451f9263013e9e366a8118af979764649563f61392f994 WHIRLPOOL 8c9ff0a61452d9924598b38ca8a660d080f6ddaeedc2c353d82536b60ab501be41661e328efa5ee1ea4fd6c6fd2f36245bac4de71cac6a1ef7c8d9b6e381c6f6 EBUILD libproxy-0.4.6-r3.ebuild 2369 SHA256 a8d9395c1ab0bfe74fa7d162807fbdd56c7bbacf178767e99033891807ea3887 SHA512 1bb8e552b9375544815fb5f1ee8b78db9080ec43c0dbbb3bf88c21f0b0587158e1599454137b14203b067a1023f46783f97cfaffa925caa9e3150dc5d07c85aa WHIRLPOOL 49d42e72fe6e4bac2696f5f9dff1e8a1d1cd219283aa372522ac45f6117fb78b588616dd616ea72878f642279339ee01eeae6f09872725203d4db22227611461 EBUILD libproxy-0.4.7.ebuild 2338 SHA256 125a4e2067e3f17aa759b43ef95cfdeae2a3245023d8d73daba50e53fdb21bb9 SHA512 700d7d7824abac057d68deae929bf05c7f2d36da4366c6d4e4ec8de15586c326cbc4cf813087d7fe8d7d65539ff68a0f098624568411f345e99971ae473478d2 WHIRLPOOL 825bcdfb952a5ce47b687afa3135811d6a7879639c334dc92d86dd39fd363e67406076a1883462250738361dde9d3e8930f5c3ef466b2df75c8c4e6febd68d44 -MISC ChangeLog 15121 SHA256 40e52b3852b23d20f8f2d37c126ab5623730c96ee54086a84a1618385516ec89 SHA512 9f1a4ed64fe05ffc4bb189a9e2ea59589ebcca278dd45dd51e8a6fe3d8879195e463270e19a78d0a9734fc96dee082d84b2bed4561482ef0e6a7b856b9c1fbcb WHIRLPOOL 64a7421381825dfc6121a726a58dad7867e826385e497382e6dc40c51fef8d620b4a54778a01c11e725ad7c35741d6594a66fcb3af4f099851384daeae760edf +MISC ChangeLog 15359 SHA256 67ed30d80b7fba216dc569c8b93bcba5bd3a76442c6f24c636fc7e9ec4d896e0 SHA512 e9157b147c657e94fdbc22209ac10983b79fb9ca54a2e724612e6932f22e98b215bf48d186306b5bdc6fd9fd55e82618a86085c50fa2ed89051704c6eda66198 WHIRLPOOL 653bc7b2f3408f9d9bb1889584a6bdca1269ce8e0ac0c0f76356ef865132413efc94bddaccec582eb1673961ca1e50158365ac24fbfeaeb29616446902e13f09 MISC metadata.xml 706 SHA256 f036003c89fb0aabecfc402e08129ab1a698642bc16ddc577909f6fb73d9ca9b SHA512 5699fa2ea9005031934cf7f66d7b51c814309c1f2b3b972ca12983dcdd8d6175e677f0c1d141db4c7d8e3252546b7b25ec3d660cd6a96a9e731f9e42f10f4f1b WHIRLPOOL 7f1dca48d567d95157be0b5e6a5a7612d41772207dac31a48b12012d77519d01c5ce49711ec9c563bf5f188623c85a6a1bda0b39365a25c3493eb64ed4449f67 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlCyau4ACgkQuQc30/atMkCcngCgvHNdYvEtJDY0hYd3E+lD6Zgy -rD4AoMIuWBIJQ/7IKZKsPhn6+G7S9EU7 -=wQDE +iQEcBAEBCAAGBQJQsta5AAoJEJ0WA1zPCt1hUuEH/i1X8QJ96X1tXeYvlg4zKbOW +nGBD4SANhGPmEd5KrMR8VAiybkAXgeVEYJxxhWyQdyMTlpjAHUdGozpwZdgtrObh +kHgSPbaaX0c7IvWgiFhLlNNJrb0nC9Kgk2vevzKTPktAfmgQ4NCZSESg+ey5nEZS +NHFmoFrTxSj+xyitbkOp0O8GPcs364oe7/GJQYowZGrNNADNj8/B/KAum+G7/w5R +/xY4aFFXCGLKGEnrPmvlNhW9wFgi2i/dZ5XosZ/rsv7Q5DTUIATucvgMk0pX4Vm6 +SfKSvAtnaZAqYIOpWpPQ6gVfxX5Eh4q2UDZJIT57CnWsr3EUBbXQxaJlcMGqzRs= +=VNfz -----END PGP SIGNATURE----- diff --git a/net-libs/libproxy/files/libproxy-0.4.10-cmake-2.8.10.patch b/net-libs/libproxy/files/libproxy-0.4.10-cmake-2.8.10.patch new file mode 100644 index 000000000000..80c99ac5ae1b --- /dev/null +++ b/net-libs/libproxy/files/libproxy-0.4.10-cmake-2.8.10.patch @@ -0,0 +1,31 @@ +From d979e2e99c4a216a473e39078efc8709f8cabfee Mon Sep 17 00:00:00 2001 +From: "dominique.leuenberger@gmail.com" + <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> +Date: Mon, 12 Nov 2012 20:36:59 +0000 +Subject: [PATCH] cmake 2.8.10 has slight changes to the internal API + +git-svn-id: http://libproxy.googlecode.com/svn/trunk@866 c587cffe-e639-0410-9787-d7902ae8ed56 +--- + cmake/CMakeDetermineCSharpCompiler.cmake | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/cmake/CMakeDetermineCSharpCompiler.cmake b/cmake/CMakeDetermineCSharpCompiler.cmake +index 91c1e9f..86532eb 100644 +--- a/cmake/CMakeDetermineCSharpCompiler.cmake ++++ b/cmake/CMakeDetermineCSharpCompiler.cmake +@@ -92,7 +92,11 @@ if (CMAKE_CSharp_COMPILER) + endif (CMAKE_CSharp_COMPILER) + + # configure variables set in this file for fast reload later on ++if(NOT CMAKE_PLATFORM_INFO_DIR) # pre-2.8.10 ++ set(CMAKE_PLATFORM_INFO_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}) ++endif() ++ + configure_file(${CMAKE_SOURCE_DIR}/cmake/CMakeCSharpCompiler.cmake.in +- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY) ++ ${CMAKE_PLATFORM_INFO_DIR}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY) + set(CMAKE_CSharp_COMPILER_ENV_VAR "CSC") + +-- +1.8.0 + diff --git a/net-libs/libproxy/libproxy-0.4.10-r1.ebuild b/net-libs/libproxy/libproxy-0.4.10-r1.ebuild index 1b5c50697aec..a0d01fa5bc42 100644 --- a/net-libs/libproxy/libproxy-0.4.10-r1.ebuild +++ b/net-libs/libproxy/libproxy-0.4.10-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10-r1.ebuild,v 1.10 2012/11/25 19:01:00 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10-r1.ebuild,v 1.11 2012/11/26 02:40:55 tetromino Exp $ EAPI=4 PYTHON_DEPEND="python? 2:2.6" @@ -45,6 +45,9 @@ src_prepare() { # get-pac-test freezes when run by the ebuild, succeeds when building # manually; virtualx.eclass doesn't help :( epatch "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch" + + # Fix building with cmake-2.8.10 and USE=mono; in next release; bug #444204 + epatch "${FILESDIR}/${P}-cmake-2.8.10.patch" } src_configure() { |