diff options
| author |   Mounir Lamouri <volkmar@gentoo.org> | 2009-07-06 13:22:07 +0000 |
|---|---|---|
| committer | Mounir Lamouri <volkmar@gentoo.org> | 2009-07-06 13:22:07 +0000 |
| commit | 12815321d284e426e22966dc351328ff6b803c2f (patch) | |
| tree | cad57ac0e7aab11b2afe839e5f170511b05a138f /dev-libs/xmlrpc-epi | |
| parent | remove mask for mail-client/claws-mail 3.7.2 and all its plugins, all in tree (diff) | |
| download | historical-12815321d284e426e22966dc351328ff6b803c2f.tar.gz historical-12815321d284e426e22966dc351328ff6b803c2f.tar.bz2 historical-12815321d284e426e22966dc351328ff6b803c2f.zip | |
fix xmlrpc-{c,epi} conflict, bug 274291
Package-Manager: portage-13756-svn/cvs/Linux i686
Diffstat (limited to 'dev-libs/xmlrpc-epi')
| -rw-r--r-- | dev-libs/xmlrpc-epi/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-libs/xmlrpc-epi/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/xmlrpc-epi/xmlrpc-epi-0.54-r1.ebuild (renamed from dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.ebuild) | 14 |
3 files changed, 18 insertions, 9 deletions
diff --git a/dev-libs/xmlrpc-epi/ChangeLog b/dev-libs/xmlrpc-epi/ChangeLog index 423f9fc91936..3c515f81c9ba 100644 --- a/dev-libs/xmlrpc-epi/ChangeLog +++ b/dev-libs/xmlrpc-epi/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/xmlrpc-epi # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-epi/ChangeLog,v 1.2 2009/06/16 22:50:07 volkmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-epi/ChangeLog,v 1.3 2009/07/06 13:22:07 volkmar Exp $ + +*xmlrpc-epi-0.54-r1 (06 Jul 2009) + + 06 Jul 2009; Mounir Lamouri <volkmar@gentoo.org> -xmlrpc-epi-0.54.ebuild, + +xmlrpc-epi-0.54-r1.ebuild: + Fix xmlrpc-{c,epi} conflict by installing headers to /usr/include/xmlrpc-epi. + See bug 274291 16 Jun 2009; Mounir Lamouri <volkmar@gentoo.org> xmlrpc-epi-0.54.ebuild: Add --disable-dependency-tracking diff --git a/dev-libs/xmlrpc-epi/Manifest b/dev-libs/xmlrpc-epi/Manifest index e16fc1d174a9..68b8a1fbf50b 100644 --- a/dev-libs/xmlrpc-epi/Manifest +++ b/dev-libs/xmlrpc-epi/Manifest @@ -1,4 +1,4 @@ DIST xmlrpc-epi-0.54.tar.gz 491572 RMD160 4f51c47f1e84a21b0041e770d9362c8be371c242 SHA1 e547f2399c008a818b43161c1df593a0490c7567 SHA256 bd685ec51a477a28735188c10313d9f9ca35a7725a740ad49ccdcf62d9ca0e3f -EBUILD xmlrpc-epi-0.54.ebuild 1079 RMD160 d631dfc4571faaec93f6411c4de9cd9d30ffda10 SHA1 a53207643dd737d91ef2946721c63e78549b90f3 SHA256 7935e754fab1f6a77422587e04bb40fc209e4f2946619fa9494e75487fa014df -MISC ChangeLog 483 RMD160 9dd5e44ffe1f4b15d2efdcfa0ec0b05b06d3934b SHA1 e6c023fa8f63e9c98de5a06e47f5984a1f8a4a25 SHA256 9d531d177f5f155d5a6e31ac36649466983fa52e64bf0b59949e36d5f7bb94b5 +EBUILD xmlrpc-epi-0.54-r1.ebuild 1151 RMD160 699ef3c7dc1d0c99b938101d8cfd5109cfbe7e24 SHA1 034b3e7c50df21006f2951dfa85a2a00cc1b798b SHA256 00e9743b018719d305284510f57719eadfd3dec9b66a217095a3852bad31a13d +MISC ChangeLog 722 RMD160 39ef31b6d20cbce77b8d30d8307e389750ccc0e4 SHA1 12f9a2dfdc7057913b7f348c2d7f4d7b86f236de SHA256 e53792b8ea1031e0f25b7e3bcae9fe2e7cf06837aae43b35b6f30f53d2df8e66 MISC metadata.xml 257 RMD160 224ee82bfe66c5da4a2dc1dd697b1782e7f03cb9 SHA1 6b583c76750b206bd133403d1a4685a14f8e6b95 SHA256 45f231de4d8bc5ed6309ba83d2eb9a06b8e13f828d7b74e909a144439356cd62 diff --git a/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.ebuild b/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54-r1.ebuild index 05c64429fc68..000f277aa0a1 100644 --- a/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.ebuild +++ b/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.ebuild,v 1.2 2009/06/16 22:50:07 volkmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54-r1.ebuild,v 1.1 2009/07/06 13:22:07 volkmar Exp $ EAPI="2" @@ -13,12 +13,12 @@ SLOT="0" KEYWORDS="~ppc ~x86" IUSE="examples" -DEPEND="dev-libs/expat - !!dev-libs/xmlrpc-c" +DEPEND="dev-libs/expat" RDEPEND="${DEPEND}" -# TODO: -# fix /usr/include/xmlrpc.h conflict with dev-libs/xmlrpc-c, bug 274291 +# NOTES: +# to prevent conflict with xmlrpc-c, headers are installed in +# /usr/include/${PN} instead of /usr/include (bug 274291) src_prepare() { # do not build examples @@ -26,7 +26,9 @@ src_prepare() { } src_configure() { - econf --disable-dependency-tracking + econf \ + --includedir=/usr/include/${PN} \ + --disable-dependency-tracking } src_install() { |