Really, *don't* build abyss. Bug 227187.

Package-Manager: portage-2.1.5.5

4 files changed, 39 insertions, 8 deletions

diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog
index 5c082e4369a5..1699dd140cad 100644
--- a/dev-libs/xmlrpc-c/ChangeLog
+++ b/dev-libs/xmlrpc-c/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/xmlrpc-c
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.58 2008/06/08 22:35:23 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.59 2008/06/15 16:00:19 loki_val Exp $
+
+  15 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/xmlrpc-c-1.14.07-abyss-disable.patch, xmlrpc-c-1.14.07.ebuild:
+  Really, *don't* build abyss. Bug 227187.
 
   08 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
   -xmlrpc-c-1.06.03.ebuild:
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index fca18df15c21..612628b0aac6 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -8,12 +8,13 @@ AUX xmlrpc-c-1.06.09-strsol.patch 602 RMD160 b18f2ceb63c44cccdbcc2f38cefd7d5f276
 AUX xmlrpc-c-1.06.27-abyss-header-fixup.patch 896 RMD160 a9e536a19d78dad7040f945ffce7520b338fa9f9 SHA1 a23fef2d86a7dd21215414ca669e213c4adeb7e2 SHA256 0bfb14b42800043b210652d86f48901db4a1706caee7b45f63bd8ba95b1048bc
 AUX xmlrpc-c-1.06.27-curl-easy-setopt.patch 800 RMD160 477121a69fbd1e4f923ec6e38cb86411d27e104b SHA1 17b92331be7d01854dcdb43b25fb0ce7733c4b7c SHA256 988cb420a9bac9bb62038158174c0d1b75ab4249526b71c202b7b55cee468961
 AUX xmlrpc-c-1.06.27-gcc43-test-fix.patch 1045 RMD160 e86d11e2279fea066fd7709a681b32a3ec01bc50 SHA1 16e4bd8a33cb6ff0d94d65e2d540f1400b424e37 SHA256 ddf21cad0ae3a44ae3d626bf34672e65c7bb37c8b652d04c87565bdd05f753e5
+AUX xmlrpc-c-1.14.07-abyss-disable.patch 677 RMD160 14904bb01c95451e1dd66ae0dce798ce31f73087 SHA1 2ffbfdcd98f134d51d52a0a7c3fc9f02985913bf SHA256 d53b2aeff24513f178f61101c188dd5fc9802d68f58b290d9860d4ca4967c30e
 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.06.09.tgz 680245 RMD160 0f8678f1f643ae6d78d445d96e7205e89b4d07c5 SHA1 9a6b902c61e9d8a76d66527562caa1d397c6addd SHA256 3dd759bb3fc2df519c51cfac605144f973e28603c1d9e028211212dc3dfd3f22
 DIST xmlrpc-c-1.14.07.tar.bz2 553066 RMD160 6bc4628c1e9bceffc4b767ee28deca970620d682 SHA1 d47fe18dad11162492262a351a94721d2fcf19b9 SHA256 a49631fad33aa9a7f822f88fa87bfb53d53b4629cc40eec22e297071ab35bbee
 EBUILD xmlrpc-c-1.06.09-r2.ebuild 1869 RMD160 a3a1393f2fb32f42b213b1156059e60537561d27 SHA1 deab9d879bd08e323b1b2528ba0328350f86cb1d SHA256 7c9c9a2f9fa6f9d3aa08dfed2eb3c5f847da8b1ab1dce18356ab1502c68737a7
 EBUILD xmlrpc-c-1.06.27.ebuild 2226 RMD160 65ce4eec4a383826bb7115628484ebd1faeb13d5 SHA1 fd50db6fc7fa42687beafc5525e1b2ee7b2aa3b1 SHA256 12442672f4d295d6ad88dea7aeda06cc05098342f575595abe2c8af03c548561
-EBUILD xmlrpc-c-1.14.07.ebuild 2028 RMD160 1bde3c1d5e1f86d90b96241067c74917e0c9e8eb SHA1 6f634c989b1cafc1bd1ad919ea5bc2f1128b1985 SHA256 3d584abcfd96fa652c40c9870337c864245ea9721e6239876c71143915891a83
-MISC ChangeLog 8889 RMD160 4fdd3449921017fcedc9a17ab9d5b43caa7ab0fa SHA1 24786fe82a8c99cdef95808ec5ef2a020e267c67 SHA256 fe68fdcedc0eb64a932dbeca54b17df595f07f70064bd0948e84f165018c0082
+EBUILD xmlrpc-c-1.14.07.ebuild 2084 RMD160 637360dbec6ad0ff271db1b31205654e0b1a3b2d SHA1 8ef08019814836b71c8dc5a031a49fb7570f4da6 SHA256 ae9af31ec2a6e84afc7acd782195fb1af4dfe94abc85fbd2b816a7af0503ccb8
+MISC ChangeLog 9058 RMD160 84ac70ec4940ca4d396a194d16b057230ec6daf8 SHA1 1d57c2249535fa0998448d9b80d71d1f53590e13 SHA256 265ad013bb2ac30f4cdf705c0b2072b1950871f1bbd0228c282e6e8e2a2ee17c
 MISC metadata.xml 258 RMD160 e363fac4024fa1d6e8481465c06e42cbe2eb9e2a SHA1 26ea33fa143b55cfa84ee879aab41f1b5e337127 SHA256 960cfc8d2eda3540d50ea76f60889fb72e3dc8342ecd9dce2070517e4469f599
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.14.07-abyss-disable.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.14.07-abyss-disable.patch
new file mode 100644
index 000000000000..c7a5bafce04d
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.14.07-abyss-disable.patch
@@ -0,0 +1,22 @@
+diff -NrU5 xmlrpc-c-1.14.07.orig/src/cpp/Makefile xmlrpc-c-1.14.07/src/cpp/Makefile
+--- xmlrpc-c-1.14.07.orig/src/cpp/Makefile	2008-06-15 16:12:38.000000000 +0200
++++ xmlrpc-c-1.14.07/src/cpp/Makefile	2008-06-15 16:15:54.000000000 +0200
+@@ -15,14 +15,17 @@
+ 
+ TARGET_LIB_NAMES_PP := \
+   libxmlrpc_cpp \
+   libxmlrpc++ \
+   libxmlrpc_server++ \
+-  libxmlrpc_server_abyss++ \
+   libxmlrpc_server_pstream++ \
+   libxmlrpc_packetsocket \
+ 
++ifeq ($(ENABLE_ABYSS_SERVER),yes)
++  TARGET_LIB_NAMES_PP += libxmlrpc_server_abyss++
++endif
++
+ ifeq ($(MUST_BUILD_CLIENT),yes)
+   TARGET_LIB_NAMES_PP += libxmlrpc_client++
+ endif
+ 
+ STATIC_LIBRARIES_TO_INSTALL = $(TARGET_STATIC_LIBRARIES)
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild
index c45b91a311f6..b77c3378e6dc 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 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.14.07.ebuild,v 1.1 2008/06/04 12:19:08 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.14.07.ebuild,v 1.2 2008/06/15 16:00:19 loki_val Exp $
 
 EAPI=1
 
-inherit eutils autotools
+inherit eutils autotools base
 
 DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
 SRC_URI="mirror://gentoo/${PN}/${P}.tar.bz2"
@@ -25,13 +25,17 @@ pkg_setup() {
 	fi
 }
 
+PATCHES=( "${FILESDIR}/${P}-abyss-disable.patch" )
+
 src_unpack() {
-	unpack ${A}
+	base_src_unpack
 	cd "${S}"
 
 	# Respect the user's CFLAGS/CXXFLAGS.
-	sed -i -e "/CFLAGS_COMMON/s:-g -O3$:${CFLAGS}:" Makefile.common
-	sed -i -e "/CXXFLAGS_COMMON/s:-g$:${CXXFLAGS}:" Makefile.common
+	sed -i \
+		-e "/CFLAGS_COMMON/s:-g -O3$:${CFLAGS}:" \
+		-e "/CXXFLAGS_COMMON/s:-g$:${CXXFLAGS}:" \
+		"${S}"/Makefile.common
 	eautoreconf
 }