dev-libs/librets: Fixed problem with boost dependency so that it builds with the...

svn path=/sunrise/; revision=12338

diff --git a/dev-libs/librets/ChangeLog b/dev-libs/librets/ChangeLog
index df12e2003279bb22b3faea17d1c5d366c4c8509a..d2da230da8e433e6284f69606bd93f5b059baf0f 100644 (file)
--- a/dev-libs/librets/ChangeLog
+++ b/dev-libs/librets/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Aug 2011; Matthew Schultz (mschultz) <mattsch@gmail.com>
+  -librets-1.5.2-r1.ebuild, +librets-1.5.2-r2.ebuild:
+  Fixed problem with boost dependency so that it builds with the latest
+  compatible version.
+
   23 Jul 2011; Matthew Schultz (mschultz) <mattsch@gmail.com>
   -librets-1.5.2.ebuild, +librets-1.5.2-r1.ebuild:
   Changed ruby dependency to use eclass function and removed custom

diff --git a/dev-libs/librets/Manifest b/dev-libs/librets/Manifest
index e584f20333ffeee7c0056eb6a0b4759edc205f1b..3d61dc0100dec000d60c95b6f4f3aafd62baad76 100644 (file)
--- a/dev-libs/librets/Manifest
+++ b/dev-libs/librets/Manifest
@@ -5,6 +5,6 @@ AUX perl.mk.patch 1088 RMD160 7054d8bb712814434e3978c69c36ff267c102a5a SHA1 660f
 AUX python.mk.patch 501 RMD160 611578ad08ee095d4364e538e6b69e4f5727d401 SHA1 803f4678b974d87008e772115d09034fb31bb8fe SHA256 8ba69a842499dcfeaaba25ac8fb9f4723d7243293b7fba7734510bca47eb89cb
 AUX swig.m4.patch 462 RMD160 d0e5b1f14b78d514a7bcee9e052e433645a02162 SHA1 6003ea54742da9aff9b9a320643819ad34f1cf7b SHA256 aa217a9442f967196027ef589e114eeca2d5583506b69eeae72dd9107f8594d1
 DIST librets-1.5.2.tar.gz 1157546 RMD160 154a4fff9bbf994b739a1d30b3bb5eed9ecdd5d3 SHA1 cc856a41bc8120865937d199c918542bf3d82a95 SHA256 5d9c32eefd1a20b90c58ef117010768d8161c56ee0138efa4dd8b1ab82a433ce
-EBUILD librets-1.5.2-r1.ebuild 7419 RMD160 d65c8d621bfcbb83ddb1e737ad0f7f42867f9e07 SHA1 f02206d19eadab25bc1ee7d04762c23b903596ce SHA256 833a8d86eb9d3fd9956e8664b1f6c9f58d5f4825d6a1a4cfbd8990986c311bc8
-MISC ChangeLog 1720 RMD160 557289e6c01afa23ae289fcbcc45561961960b9a SHA1 4bf72274c400ea3442d07e9a8ad10b8bae0238bc SHA256 5a4863dccb3630b7ac5bf076e50c801cc269670850f48c2d773f66ecf42ddcaa
+EBUILD librets-1.5.2-r2.ebuild 7771 RMD160 bc55c1e6138076fbbbd9dd6073fb3beac668902f SHA1 b5c579863a1bcc3cddad8b4a6f8d7f18172830a1 SHA256 f53916a88b68329afac30d16dc8e0f078492064d7596a67ea889a96943e1137c
+MISC ChangeLog 1931 RMD160 b52d9985fc08ca2cf5added50f78f8b23e16e498 SHA1 0abcee59369f6b033247977134783668d6e78556 SHA256 9af8d93bac06e331e4ed44d54432f9bab84184de5f747e7b0d990c5dd237219f
 MISC metadata.xml 853 RMD160 ed63f9597114e696a3c5a40812f4aab838ff6b37 SHA1 1b72b0eb34f6bbfff554cb73217a4a950b40d550 SHA256 f4037036447d4657b2c235437ed5403b80ef67469080bb98e5dddf7088bf96a9

diff --git a/dev-libs/librets/librets-1.5.2-r1.ebuild b/dev-libs/librets/librets-1.5.2-r2.ebuild
similarity index 92%
rename from dev-libs/librets/librets-1.5.2-r1.ebuild
rename to dev-libs/librets/librets-1.5.2-r2.ebuild
index ac4d1cc4639e671fc8fbe5257380b39b4b083709..812ae9a714e735743b92e955f88293a23cbf9a4e 100644 (file)
--- a/dev-libs/librets/librets-1.5.2-r1.ebuild
+++ b/dev-libs/librets/librets-1.5.2-r2.ebuild
@@ -15,7 +15,7 @@ PYTHON_MODNAME="librets.py"
 USE_RUBY="ree18 ruby18 ruby19"
 RUBY_OPTIONAL="yes"
 
-inherit distutils eutils java-pkg-opt-2 mono perl-module php-ext-source-r2 ruby-ng
+inherit distutils eutils java-pkg-opt-2 mono multilib perl-module php-ext-source-r2 ruby-ng versionator
 
 DESCRIPTION="A library that implements the RETS 1.7, RETS 1.5 and 1.0 standards"
 HOMEPAGE="http://www.crt.realtors.org/projects/rets/librets/"
@@ -37,11 +37,10 @@ for i in java perl php python ruby; do
        )"
 done
 
-# Assuming this the proper way to depend on ruby interpreter when ruby is optional
 RDEPEND="
-       dev-libs/boost
+       <dev-libs/boost-1.46
        dev-libs/expat
-       dev-util/boost-build
+       <dev-util/boost-build-1.46
        java? ( >=virtual/jdk-1.6.0 )
        mono? ( dev-lang/mono )
        net-misc/curl
@@ -162,7 +161,12 @@ src_compile() {
                _php-replace_config_with_selected_config ${myphpfirstslot} ${myphpconfig}
                myphpconfig="${PHPCONFIG}"
        fi
-       emake || die "emake failed"
+       local myboostpackage=$(best_version "<dev-libs/boost-1.46")
+       local myboostpackagever=${myboostpackage/*boost-/}
+       local myboostver=$(get_version_component_range 1-2 ${myboostpackagever})
+       local myboostslot=$(replace_version_separator 1 _ ${myboostver})
+       einfo "Using boost version ${myboostver}"
+       emake BOOST_CFLAGS="-I/usr/include/boost-${myboostslot}" BOOST_LIBS="-L/usr/$(get_libdir)/boost-${myboostslot}" || die "emake failed"
        if use php; then
                # Move the current slotted build of php to another dir so other slots can be built
                _php-move_swig_build_to_modules_dir "${WORKDIR}/${myphpfirstslot}"