Fix boost detection when multiple versions are available. Patch thanks to Sebastian...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-fs/encfs/ChangeLog b/sys-fs/encfs/ChangeLog
index c794f478d0eb109b4753bf7464993793208a2e80..42dd98183d1cd1bb9de4878d05dbc0122d23050f 100644 (file)
--- a/sys-fs/encfs/ChangeLog
+++ b/sys-fs/encfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/encfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/ChangeLog,v 1.43 2010/06/27 21:00:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/ChangeLog,v 1.44 2010/06/29 08:44:08 caster Exp $
+
+  29 Jun 2010; Vlastimil Babka <caster@gentoo.org> encfs-1.6.ebuild:
+  Fix boost detection when multiple versions are available. Patch thanks to
+  Sebastian Luther (few) <SebastianLuther@gmx.de> and Rob MacKinnon
+  <c4blem0nkey@gmail.com> bug #297694.
 
   27 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> encfs-1.6.ebuild:
   Remove USE="nls" wrt #277239 by Martin Väth.

diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest
index 761eee0b38014fa37f70892650ce33fe432816e8..aeed3b4dd60dfdf5d0e676e3c89579b143c77f45 100644 (file)
--- a/sys-fs/encfs/Manifest
+++ b/sys-fs/encfs/Manifest
@@ -5,6 +5,6 @@ AUX encfs-1.5-glibc-2.10.patch 299 RMD160 2fc786bee544b2a891e5ee283b5da7f2016bb8
 DIST encfs-1.5-2.tgz 923047 RMD160 c773312e20fa5cb155e0e630cb17afa7c525905f SHA1 7fe225855645d98a33bf9f5fe64ac508fdb75257 SHA256 d3961fa5a83bb2c3242ae579e29aa9f73db1e6969a6b5be66acd952b2f9be112
 DIST encfs-1.6-1.tgz 930653 RMD160 5503afc03e79f94db03c657c36df3a7118f34789 SHA1 584128305764d794ea7644d033aa1247eff66b08 SHA256 bc02036e3fe123742a3a2fb711f3f7000321b5a9b82517e34b6b456f0b8ba04c
 EBUILD encfs-1.5.ebuild 1138 RMD160 91f59f754be1ec47a6c605a954a69be375a07373 SHA1 891d473b6ccea2f14763771763a081c28ea802ae SHA256 aba26a2620db6c97d2e22f13abf8e9e5e9559bfb702a9ccab115f8dee5745df6
-EBUILD encfs-1.6.ebuild 835 RMD160 7bf1228fc0f65aa4fced84838ce48c4bfe00af18 SHA1 4824daf5bba9602290d79298c21a3f08bc9574c0 SHA256 5e8428525c175eb1b6d65590b2b68270fdc75d546fc7e37ba2628ec755c56c6d
-MISC ChangeLog 7435 RMD160 1a31a51690fb5e245cf057b80b5884bb9fa5be0b SHA1 9be450bda9ffe024629cf178b0dc1d04ab71bd4b SHA256 4b61e91206bd628b8036de1ea13878c05d3728c9ca344864304ddc378dc4d27a
+EBUILD encfs-1.6.ebuild 1249 RMD160 227425ec6ebddf8189945fe7bd357df744f26b64 SHA1 0c82eb3a13409f96b44f84755fbaa8935d4b4265 SHA256 d16e5d6a2a012c158a039246522d713efd4f747db1ec008b84f85a802a80c350
+MISC ChangeLog 7685 RMD160 1e1d4090c48acbacd73d5fbeb71cdbe95f32786a SHA1 6291814e02a77eabf86019a37620c62981ac29af SHA256 4255d9e37777f80947f6b995465abfbee3421a372c6d3356284eb940d4d45a45
 MISC metadata.xml 262 RMD160 f3d8d0dd73230dfdca175ef66a091c78e44d0f98 SHA1 f08c61f42ce181c625ddaf232ba6e2c86af06250 SHA256 d90fbcb5c6704d3d97dc2cceb80fee7acde549638a4f0270b0d87f64fcee82fa

diff --git a/sys-fs/encfs/encfs-1.6.ebuild b/sys-fs/encfs/encfs-1.6.ebuild
index 586b6aeab3738b112731e392a0493fdb5f105b08..8e0d67e3f68d4bd573d9f974f0cf252d2ac9b090 100644 (file)
--- a/sys-fs/encfs/encfs-1.6.ebuild
+++ b/sys-fs/encfs/encfs-1.6.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/encfs-1.6.ebuild,v 1.2 2010/06/27 21:00:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/encfs-1.6.ebuild,v 1.3 2010/06/29 08:44:08 caster Exp $
 
 EAPI=2
 
+inherit eutils versionator
+
 DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE"
 HOMEPAGE="http://www.arg0.net/encfs/"
 SRC_URI="http://encfs.googlecode.com/files/${P}-1.tgz"
@@ -24,7 +26,16 @@ DEPEND="${RDEPEND}
        sys-devel/gettext"
 
 src_configure() {
+       BOOST_PKG="$(best_version dev-libs/boost)"
+       BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+       BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+       BOOST_INC="/usr/include/boost-${BOOST_VER}"
+       BOOST_LIB="/usr/$(get_libdir)/boost-${BOOST_VER}"
+       ewarn "Building with ${BOOST_PKG} support."
+
        econf \
+               --with-boost=${BOOST_INC} \
+               --with-boost-libdir=${BOOST_LIB} \
                --disable-dependency-tracking
 }