From 76839a93fbd1c2a9bf4a5c1eddba23c15378e4ce Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Sat, 1 Oct 2011 21:44:07 +0000 Subject: [PATCH] Version bump, bug #299011 wrt Arfrever Frehtes Taifersar Arahesis. Fixes parallel build issue, bug 291881 wrt simon. Fixes build on BSD, bug #283751 wrt Henning Schild. Fixes installation of shared libraries, bug #274536 wrt Ambroz Bizjak. Fixes build failure with specific USE flags combination, bug 301076 wrt Marco Clocchiatti. And thank Andreis_Vinogradovs (slepnoga) for making me work on this version bump. Package-Manager: portage-2.1.10.19/cvs/Linux x86_64 --- dev-libs/xmlrpc-c/ChangeLog | 13 ++- dev-libs/xmlrpc-c/Manifest | 19 +--- .../xmlrpc-c-1.28.00-advanced-test.patch | 51 ++++++++++ dev-libs/xmlrpc-c/metadata.xml | 11 ++- dev-libs/xmlrpc-c/xmlrpc-c-1.28.00.ebuild | 93 +++++++++++++++++++ 5 files changed, 171 insertions(+), 16 deletions(-) create mode 100644 dev-libs/xmlrpc-c/files/xmlrpc-c-1.28.00-advanced-test.patch create mode 100644 dev-libs/xmlrpc-c/xmlrpc-c-1.28.00.ebuild diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog index 2e4ca57150bc..063f3c2ab9a4 100644 --- a/dev-libs/xmlrpc-c/ChangeLog +++ b/dev-libs/xmlrpc-c/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for dev-libs/xmlrpc-c # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.96 2011/07/25 10:21:06 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.97 2011/10/01 21:44:07 pva Exp $ + +*xmlrpc-c-1.28.00 (01 Oct 2011) + + 01 Oct 2011; Peter Volkov +xmlrpc-c-1.28.00.ebuild, + +files/xmlrpc-c-1.28.00-advanced-test.patch, metadata.xml: + Version bump, bug #299011 wrt Arfrever Frehtes Taifersar Arahesis. Fixes + parallel build issue, bug 291881 wrt simon. Fixes build on BSD, bug #283751 + wrt Henning Schild. Fixes installation of shared libraries, bug #274536 wrt + Ambroz Bizjak. Fixes build failure with specific USE flags combination, bug + 301076 wrt Marco Clocchiatti. And thank Andreis_Vinogradovs (slepnoga) for + making me work on this version bump. 25 Jul 2011; Christoph Mende xmlrpc-c-1.06.27.ebuild, +files/xmlrpc-c-1.06.27-curl-headers.patch, xmlrpc-c-1.18.02.ebuild, diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest index e1a14e10d1ad..0af88255f00c 100644 --- a/dev-libs/xmlrpc-c/Manifest +++ b/dev-libs/xmlrpc-c/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX xmlrpc-c-1.05-pic.patch 566 RMD160 2e64750d04cdb3a9ad9f95e753e6dd46d4cd650c SHA1 5b266ed0600aa32c5f461df402038ffee1dac87c SHA256 b27f31ef0098ff83518be25131b1ddb72a3290c45636219a58cbf7dcd5ff415d AUX xmlrpc-c-1.06.02-strsol.patch 716 RMD160 c98b5c6d10ae1b11d57ed80515aa2e7855acceb7 SHA1 5540ded87bd50ca0a413c0b4bbf5faa630754d32 SHA256 2ffd9c6cf54a1bb8664b0d0aeb36985efd40d65ccf71f697ad0f6efb845adedd AUX xmlrpc-c-1.06.02-threadupdatestatus.patch 465 RMD160 e8e8cdeb31d0afad547dd8abab3533e9f54114ba SHA1 b209a5d55c3e587eabe220503c8818b17731fc78 SHA256 64fac915d4bdab37ebf04fece7066213a96d09651d4e088c90f08e9fd364a985 @@ -16,19 +13,13 @@ AUX xmlrpc-c-1.18.02/cpp-depends.patch 777 RMD160 575f16e59927a5a1cd76c55405871f AUX xmlrpc-c-1.18.02/curl-headers.patch 1038 RMD160 b9d6b8de1dbf73140c715ad64fbfa8625ab7cd3a SHA1 2398b2d7a43fa22d9bd09d4742599507d2d0fc42 SHA256 28c48b11334806958824f77601fcb73f1910e0a1b4f0b4c7f4198b54e20db739 AUX xmlrpc-c-1.18.02/dump-symlinks.patch 19339 RMD160 1ed2bb4cddabb6ddabd3b8c15bf0d4dfd209607c SHA1 11ce54c1099c219d14c8f9c0411d22deba9d882a SHA256 4320670f81a8d20ec96bf9ce4ffc458792eeadaee49c515923f4858ff4ba6f02 AUX xmlrpc-c-1.18.02/dumpvalue.patch 520 RMD160 63947d91c5498bd603db30cc7efa85440eefbe46 SHA1 343d0ead6deada7eba40ebf832fe2f21222e1cac SHA256 a53f6b2fb44db2775e704bacee04fbcf8b2d2ab6eea27407e2de44213f933404 +AUX xmlrpc-c-1.28.00-advanced-test.patch 1712 RMD160 194616f934f29e33587451221927ea8dde76175b SHA1 5b86915154a881607b7f67bb74b016d71e8b501d SHA256 ccff39eb7afa62da912a0454b2300c52d41c2de358e8925949c4e8247d8ac768 AUX xmlrpc-c-gcc43.patch 3386 RMD160 7260a649337849caa2784f0ecdbe9a64e31215a7 SHA1 a90b4ba1ad7ba793dce640f62c15cdb46ee5d36f SHA256 d34c3c5e7b7fbcba19a1abdb1afafdeaebb32fff7300981027c6ed247eb80092 DIST xmlrpc-1.06.27.tgz 699510 RMD160 65803ad240331182ecdddf442c0da80669ae3292 SHA1 7dc857eb411b2acf04a127ee5623e0961633bfac SHA256 04e81ec9f4b0e586be41ccffd402f42b6c268ec2fc7875d44fcbb4ba7a660378 DIST xmlrpc-c-1.18.02.tar.bz2 552233 RMD160 efe2f03ae37512636d33c7d285c46d9050e9296b SHA1 b815899dff10d245b31257f434230f8e45f2446a SHA256 b59845ebbad959f86a349873fda75af02a69105a4e5c6a7eb40225358677411a +DIST xmlrpc-c-1.28.00.tar.gz 751660 RMD160 1da3fec6be783da66c77a8156e8a92e939e980d1 SHA1 5d005f661a4e516fa2b155cab39ea2b29671c41f SHA256 52c0e913f87de14ff46cc56d4df4db07d2e51627515b819ea8b795c3d8f71742 EBUILD xmlrpc-c-1.06.27.ebuild 2260 RMD160 d9f88caa84597ac08e40b7720ad20de8c2cc1839 SHA1 9eae88dfa3d3a28e52df3b3ababb277d382a08e5 SHA256 2e2e2cc0d557fb3bbd4240e3fcce1b742347b4a90b2e6e68950b60099348d402 EBUILD xmlrpc-c-1.18.02.ebuild 2211 RMD160 fa2902c60ea1ab80b429d8817fbf34490cff1c3f SHA1 e1118cb342fd8606eaaef0a3b5a5f7ab41b6ff6e SHA256 db6e29daabeda78c93f071e9bca5380f2f094b5d59ee7abe6d62a34650eb46e4 -MISC ChangeLog 15699 RMD160 53e36eb7642d4f372610f74da716e491e75b9e3c SHA1 43945c1f24278ef00c4ee1e891acc1c218b58879 SHA256 177058b73e158de1a5f8f2347506770c36b64bc4931890685563db7baa523162 -MISC metadata.xml 477 RMD160 e401c48b762ed1eb8f8b8033894873be8a47f3f0 SHA1 a05e6e547e506814a82a49cdfb199ec737282df1 SHA256 ad50af893d9d0d1cc14e014ce89a4dac0b5a5f9ac74d2912e3381695da6e9848 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iJwEAQEIAAYFAk59C64ACgkQfXuS5UK5QB038QP/SoCb8sETT60GtTlEEhg1y5oD -B0XiGFMlWDhcGnqbO5O9WvmzVd296Var/nq/GcwPyqgTrfsdGeVkbRHE9UePCn6q -VUN4W51ornlck8776Gm9y6JDfrXyIQVP5oXhC9vkQ28fjOhC/E38s8deyluXAXjP -WCw05yDf8MbebiroDuY= -=NkoY ------END PGP SIGNATURE----- +EBUILD xmlrpc-c-1.28.00.ebuild 2820 RMD160 b68c4b75633e0d9a14ea1e49d3907841a75315bf SHA1 e6cc50fd1ca10d7ea928dd62dbaaa4064f08cccf SHA256 62f321f20aa75167716bd391ac2d402ed417032e1e2bebdb8d7311d235fe83dd +MISC ChangeLog 16286 RMD160 4ed97854a93fd58d56b1216bfffed7871161bb3e SHA1 56ba9f2394bf5dadffee3573f3138256c71b8529 SHA256 3c29d12bf7e2bdf729497dc9e99c7c361273cb0bd91ecb482d06e5f846811b28 +MISC metadata.xml 772 RMD160 e5d04e426063540f5c087c023e1c1a61b9739d3a SHA1 2a8330eacf5eb68b773e9e8e5103a716bb42d21c SHA256 d1df60bd428b80be270ce33f6ed4cf50f6ef3c79f4fada6174d36d8acf9ec616 diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.28.00-advanced-test.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.28.00-advanced-test.patch new file mode 100644 index 000000000000..73a552b71a91 --- /dev/null +++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.28.00-advanced-test.patch @@ -0,0 +1,51 @@ +Index: test/method_registry.c +=================================================================== +--- test/method_registry.c (revision 2200) ++++ test/method_registry.c (working copy) +@@ -37,9 +37,9 @@ + #ifndef WIN32 + /* xmlrpc_server_version_major, etc. are not exported from a Windows DLL */ + +- TEST(major = xmlrpc_server_version_major); +- TEST(minor = xmlrpc_server_version_minor); +- TEST(point = xmlrpc_server_version_point); ++ TEST(major == xmlrpc_server_version_major); ++ TEST(minor == xmlrpc_server_version_minor); ++ TEST(point == xmlrpc_server_version_point); + #endif + } + +Index: test/client.c +=================================================================== +--- test/client.c (revision 2200) ++++ test/client.c (working copy) +@@ -26,9 +26,9 @@ + #ifndef WIN32 + /* xmlrpc_client_version_major, etc. are not exported from a Windows DLL */ + +- TEST(major = xmlrpc_client_version_major); +- TEST(minor = xmlrpc_client_version_minor); +- TEST(point = xmlrpc_client_version_point); ++ TEST(major == xmlrpc_client_version_major); ++ TEST(minor == xmlrpc_client_version_minor); ++ TEST(point == xmlrpc_client_version_point); + #endif + } + +Index: test/test.c +=================================================================== +--- test/test.c (revision 2200) ++++ test/test.c (working copy) +@@ -87,9 +87,9 @@ + #ifndef WIN32 + /* xmlrpc_version_major, etc. are not exported from a Windows DLL */ + +- TEST(major = xmlrpc_version_major); +- TEST(minor = xmlrpc_version_minor); +- TEST(point = xmlrpc_version_point); ++ TEST(major == xmlrpc_version_major); ++ TEST(minor == xmlrpc_version_minor); ++ TEST(point == xmlrpc_version_point); + #endif + } + diff --git a/dev-libs/xmlrpc-c/metadata.xml b/dev-libs/xmlrpc-c/metadata.xml index 1e9d08fcf711..d761412df4aa 100644 --- a/dev-libs/xmlrpc-c/metadata.xml +++ b/dev-libs/xmlrpc-c/metadata.xml @@ -1,13 +1,22 @@ + + spamslepnoga@inbox.ru + Andreis Vinogradovs + + + pva@gentoo.org + Peter Volkov + loki_val@gentoo.org Peter Alfredsen - Build the xmlrpc* tools. Build the Abyss mini web-server. + Use dev-libs/libxml2 to parse XML instead of the internal expat library. Controls whether to build the Abyss web-server with pthreads or fork 'threading'. + Build the xmlrpc* tools. diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.28.00.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.28.00.ebuild new file mode 100644 index 000000000000..36b1365d505e --- /dev/null +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.28.00.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.28.00.ebuild,v 1.1 2011/10/01 21:44:07 pva Exp $ + +EAPI="4" + +inherit eutils multilib + +# Maintainer notes: Take a look at http://xmlrpc-c.sourceforge.net/release.html +# We use "advanced" branch, so for the current release revision take look here: +# http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/version.mk?view=log +# e.g. for 1.27.05 corresponds following revision 2182 and thus following URL: +# http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced.tar.gz?view=tar&pathrev=2182 +# Note: autogenerated tarball checksum will change everytime, thus download it +# manually and distribute on mirrors. +# It's possible to build net-libs/libwww without ssl support, but taking into +# account that libwww is not really well maintained and upstream is dead we +# better use it only in case ssl is required. + +DESCRIPTION="A lightweigt RPC library based on XML and HTTP" +HOMEPAGE="http://xmlrpc-c.sourceforge.net/" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="abyss +cgi +curl +cxx +libxml2 libwww static-libs threads tools" + +REQUIRED_USE="test? ( static-libs abyss curl cxx )" + +DEPEND=" + tools? ( dev-perl/frontier-rpc ) + curl? ( net-misc/curl ) + libwww? ( net-libs/libwww[ssl] ) + libxml2? ( dev-libs/libxml2 )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/advanced" + +pkg_setup() { + use curl || use libwww || \ + ewarn "Curl support disabled: No client library will be be built" +} + +#Bug 214137: We need to filter this. +unset SRCDIR + +# Bug 255440 +export LC_ALL=C +export LANG=C + +src_prepare() { + epatch "${FILESDIR}/xmlrpc-c-1.28.00-advanced-test.patch" + sed -i \ + -e "/CFLAGS_COMMON/s|-g -O3$||" \ + -e "/CXXFLAGS_COMMON/s|-g$||" \ + "${S}"/common.mk || die + + export LADD=${LDFLAGS} # Respect the user's LDFLAGS. + + use static-libs || { sed \ + -e '/\(^TARGET_STATIC_LIBRARIES =\)/{s:\(^TARGET_STATIC_LIBRARIES =\).*:\1:;P;N;d;}' \ + -i common.mk || die; } +} + +src_configure() { + econf --disable-wininet-client \ + $(use_enable libxml2 libxml2-backend) \ + $(use_enable libwww libwww-client) \ + $(use_enable libwww libwww-ssl) \ + $(use_enable tools) \ + $(use_enable threads abyss-threads) \ + $(use_enable cgi cgi-server) \ + $(use_enable abyss abyss-server) \ + $(use_enable cxx cplusplus) \ + $(use_enable curl curl-client) +} + +src_compile() { + emake -r +} + +src_test() { + unset LDFLAGS LADD SRCDIR + cd "${S}"/test/ + einfo "Building general tests" + make || die "Make of general tests failed" + einfo "Running general tests" + ./test || die "General tests failed" + cd "${S}"/test/cpp/ + einfo "Running C++ tests" + ./test || die "C++ tests failed" +} -- 2.26.2