Version bump (fixed problem with boost test framework and --as-needed).

svn path=/sunrise/; revision=5748

3 files changed, 61 insertions, 21 deletions

diff --git a/dev-cpp/libiqxmlrpc/Manifest b/dev-cpp/libiqxmlrpc/Manifest
index c691400a8..59d0e2285 100644
--- a/dev-cpp/libiqxmlrpc/Manifest
+++ b/dev-cpp/libiqxmlrpc/Manifest
@@ -1,4 +1,5 @@
-DIST libiqxmlrpc-0.8.1.tar.gz 412423 RMD160 06f39882df81129a152f37eaef185c11261c00ba SHA1 b9833a20b5b3e22c561b007bc0469fd871ca1f0a SHA256 6f77136a8bbcca03ed62f4738f4c3225d250d7da990b544c9bff74018d0739fc
-EBUILD libiqxmlrpc-0.8.1.ebuild 1466 RMD160 adc678cc5f402af8868f2ef44cf8b60a64854d28 SHA1 7ab47affef2efc418c3a4655b00317f80688c00f SHA256 c1fe34b3d44f58045d8bc0e4d09faae1dc568144d51f5d5c33d9407b6fe6d9dd
+AUX 0.8.7-boost_test_framework_detection.patch 2307 RMD160 5fb62235e952c15069594926ee866d899dc77448 SHA1 8115ba8bef54affae891fb5756d6fd25d111a6c2 SHA256 727c184d165e8cd0c10c3d7eeb16eb6512886e565498ac10367d3215b035406d
+DIST libiqxmlrpc-0.8.7.tar.gz 449140 RMD160 793521334ab0c79c12e59ae2483f6d1007b0f1ec SHA1 503d4050bd736c7b750e72525a02185632a31620 SHA256 39e7c996d7aee345ec3e938602b016e5782430f9f62c947525e9c8a2f3034df8
+EBUILD libiqxmlrpc-0.8.7.ebuild 1141 RMD160 550396cdeeb22987a73b327f090ffcf1eacc6fc9 SHA1 3852dfaf0f4647b39703d1857f2c5d244bf26884 SHA256 dd4e106638c142f20a21c62e7bdd953907fb1dc1298277816a0fc7562a052d2b
 MISC ChangeLog 1288 RMD160 b95ed3202b81010345e778878603240a75172465 SHA1 20b786c857458e3d9ef32d9590770774811f2496 SHA256 036a87f3a13563f122e6f63c725bbd378639f47d72a8cd5070d01f09e5535fa6
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-cpp/libiqxmlrpc/files/0.8.7-boost_test_framework_detection.patch b/dev-cpp/libiqxmlrpc/files/0.8.7-boost_test_framework_detection.patch
new file mode 100644
index 000000000..633e7e207
--- /dev/null
+++ b/dev-cpp/libiqxmlrpc/files/0.8.7-boost_test_framework_detection.patch
@@ -0,0 +1,46 @@
+--- m4/ax_boost_unit_test_framework.m4.orig	2008-02-17 17:25:21.000000000 +0100
++++ m4/ax_boost_unit_test_framework.m4	2008-02-17 17:26:42.000000000 +0100
+@@ -62,11 +62,11 @@
+ 			AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_Test_Framework library is available])
+ 			BN=boost_unit_test_framework
+             if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then
+-         		saved_ldflags="${LDFLAGS}"
++         		saved_libs="${LIBS}"
+ 		    	for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
+                              lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
+                              $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
+-                   LDFLAGS="${LDFLAGS} -l$ax_lib"
++                   LIBS="${LIBS} -l$ax_lib"
+     			   AC_CACHE_CHECK(Boost::UnitTestFramework library linkage,
+ 	      			    		   ax_cv_boost_unit_test_framework_link,
+ 						  [AC_LANG_PUSH([C++])
+@@ -81,7 +81,7 @@
+                                  link_unit_test_framework="yes",link_unit_test_framework="no")
+ 			      AC_LANG_POP([C++])
+                   ])
+-                  LDFLAGS="${saved_ldflags}"
++                  LIBS="${saved_libs}"
+ 
+ 			      if test "x$link_unit_test_framework" = "xyes"; then
+                       BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
+@@ -90,9 +90,9 @@
+ 				  fi
+                 done
+             else
+-         		saved_ldflags="${LDFLAGS}"
++         		saved_libs="${LIBS}"
+                for ax_lib in $ax_boost_user_unit_test_framework_lib $BN-$ax_boost_user_unit_test_framework_lib; do
+-                   LDFLAGS="${LDFLAGS} -l$ax_lib"
++                   LIBS="${LIBS} -l$ax_lib"
+               			   AC_CACHE_CHECK(Boost::UnitTestFramework library linkage,
+ 	      			    		   ax_cv_boost_unit_test_framework_link,
+ 						  [AC_LANG_PUSH([C++])
+@@ -107,7 +107,7 @@
+                                  link_unit_test_framework="yes",link_unit_test_framework="no")
+ 			      AC_LANG_POP([C++])
+                   ])
+-                  LDFLAGS="${saved_ldflags}"
++                  LIBS="${saved_libs}"
+ 			      if test "x$link_unit_test_framework" = "xyes"; then
+                       BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
+                       AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
diff --git a/dev-cpp/libiqxmlrpc/libiqxmlrpc-0.8.1.ebuild b/dev-cpp/libiqxmlrpc/libiqxmlrpc-0.8.7.ebuild
index 21692b3ec..0d003c033 100644
--- a/dev-cpp/libiqxmlrpc/libiqxmlrpc-0.8.1.ebuild
+++ b/dev-cpp/libiqxmlrpc/libiqxmlrpc-0.8.7.ebuild
@@ -2,38 +2,38 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+inherit autotools eutils
 
-DESCRIPTION="Object-oriented library which represents simple XML-RPC solution both for client and server sides."
+DESCRIPTION="An object-oriented library which represents simple XML-RPC solution for client and server side."
 HOMEPAGE="http://libiqxmlrpc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="doc debug"
 
 RDEPEND="=dev-cpp/libxmlpp-1*
 	dev-libs/libxml2
-	dev-libs/boost
+	>=dev-libs/boost-1.34.1
 	dev-libs/openssl"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-pkg_setup() {
-	if has_version "<dev-libs/boost-1.34" && ! built_with_use dev-libs/boost threads ; then
-		eerror "dev-libs/boost has to be compiled with 'threads' USE-flag enabled."
-		die "Needed USE-flag for dev-libs/boost not found."
-	fi
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PV}-boost_test_framework_detection.patch"
+	AT_M4DIR="m4"
+	eautoreconf
 }
 
 src_compile() {
 	econf \
 		$(use_enable doc docs) \
 		$(use_enable debug) \
-		--with-boost-thread=boost_thread-mt \
-		--with-boost-program-options=boost_program_options-mt \
-		--with-boost-unit-test-framework=boost_unit_test_framework-mt \
+		--with-boost-unit-test-framework \
 		|| die "econf failed"
 	emake CXXFLAGS="${CXXFLAGS}" || die "emake failed"
 }
@@ -46,10 +46,3 @@ src_install() {
 		dohtml doc/libiqxmlrpc.html/*
 	fi
 }
-
-src_test() {
-	einfo "This can take some time due to stress tests"
-	cd "${S}/tests"
-	make check
-	./regression.sh
-}