From 37d7bdc340e08e97649558220bd45df7f429ea9b Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Tue, 10 Jan 2017 17:45:59 +0300 Subject: dev-libs/xmlrpc-c: revision bump Respect user CFLAGS, fix building with USE="-cxx". Drop old revision Reported-by: Gilles Dartiguelongue Gentoo-Bug: 604440 Package-Manager: portage-2.3.3 --- .../files/xmlrpc-c-1.39.11-cplusplus.patch | 14 +++++ dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild | 71 ++++++++++++++++++++++ dev-libs/xmlrpc-c/xmlrpc-c-1.39.11.ebuild | 56 ----------------- 3 files changed, 85 insertions(+), 56 deletions(-) create mode 100644 dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch create mode 100644 dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild delete mode 100644 dev-libs/xmlrpc-c/xmlrpc-c-1.39.11.ebuild diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch new file mode 100644 index 000000000000..64de06b3bb28 --- /dev/null +++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.39.11-cplusplus.patch @@ -0,0 +1,14 @@ +--- a/lib/Makefile 2015-12-30 07:22:14.000000000 +0300 ++++ b/lib/Makefile 2017-01-10 15:17:39.410000000 +0300 +@@ -9,7 +9,10 @@ + + # Build up SUBDIRS: + SUBDIRS = +-SUBDIRS += util libutil libutil++ ++SUBDIRS += util libutil ++ifeq ($(ENABLE_CPLUSPLUS),yes) ++ SUBDIRS += libutil++ ++endif + ifeq ($(ENABLE_ABYSS_SERVER),yes) + SUBDIRS += abyss + ifeq ($(ENABLE_CPLUSPLUS),yes) diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild new file mode 100644 index 000000000000..e8a106e5a994 --- /dev/null +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html +# 1. Only the "Super Stable" series is released as a tarball +# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/ +# Because of this, we are following the "Super Stable" release channel + +DESCRIPTION="A lightweigt RPC library based on XML and HTTP" +HOMEPAGE="http://xmlrpc-c.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="abyss +cgi +curl +cxx +libxml2 threads test tools" + +REQUIRED_USE="test? ( abyss curl cxx ) tools? ( curl )" + +DEPEND=" + sys-libs/ncurses:0= + sys-libs/readline:0= + curl? ( net-misc/curl ) + libxml2? ( dev-libs/libxml2 )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.32.05-Wimplicit.patch" + "${FILESDIR}/${P}-cplusplus.patch" +) + +pkg_setup() { + use curl || ewarn "Curl support disabled: No client library will be built" +} + +src_prepare() { + sed -i \ + -e "/CFLAGS_COMMON/s|-g -O3$||" \ + -e "/CXXFLAGS_COMMON/s|-g$||" \ + common.mk || die + + eapply ${PATCHES[@]} + eapply_user +} + +src_configure() { + econf \ + --disable-wininet-client \ + --disable-libwww-client \ + --without-libwww-ssl \ + $(use_enable libxml2 libxml2-backend) \ + $(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() { + # Parallel builds are fixed in v 1.43.x or newer + emake -j1 + use tools && emake -rC "${S}"/tools +} + +src_install() { + default + use tools && emake DESTDIR="${D}" -rC "${S}"/tools install +} diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11.ebuild deleted file mode 100644 index 916292bdddae..000000000000 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html -# 1. Only the "Super Stable" series is released as a tarball -# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/ -# Because of this, we are following the "Super Stable" release channel - -DESCRIPTION="A lightweigt RPC library based on XML and HTTP" -HOMEPAGE="http://xmlrpc-c.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="abyss +cgi +curl +cxx +libxml2 threads test tools" - -REQUIRED_USE="test? ( abyss curl cxx ) tools? ( curl )" - -DEPEND=" - sys-libs/ncurses:0= - sys-libs/readline:0= - curl? ( net-misc/curl ) - libxml2? ( dev-libs/libxml2 )" -RDEPEND="${DEPEND}" - -pkg_setup() { - use curl || ewarn "Curl support disabled: No client library will be built" -} - -src_configure() { - econf \ - --disable-wininet-client \ - --disable-libwww-client \ - --without-libwww-ssl \ - $(use_enable libxml2 libxml2-backend) \ - $(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() { - # Parallel builds are fixed in v 1.43.x or newer - emake -j1 - use tools && emake -rC "${S}"/tools -} - -src_install() { - default - use tools && emake DESTDIR="${D}" -rC "${S}"/tools install -} -- cgit v1.2.3-65-gdbad