Make dependency on dev-libs/db more strict, forbid linking to incompatible versions of it, wrt bug #519248. Thanks to Jonathan Vasquez <jvasquez1011 AT gmail.com> for discovering this issue and Stefan Talpalaru <stefantalpalaru AT yahoo.com> for draft of proposed solution

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 38 insertions, 24 deletions

diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog
index 6173665f4754..f5a98e374833 100644
--- a/dev-libs/Ice/ChangeLog
+++ b/dev-libs/Ice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.34 2014/03/31 20:38:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.35 2014/09/06 11:06:53 pinkbyte Exp $
+
+  06 Sep 2014; Sergey Popov <pinkbyte@gentoo.org> Ice-3.5.1.ebuild:
+  Make dependency on dev-libs/db more strict, forbid linking to incompatible
+  versions of it, wrt bug #519248. Thanks to Jonathan Vasquez <jvasquez1011 AT
+  gmail.com> for discovering this issue and Stefan Talpalaru <stefantalpalaru
+  AT yahoo.com> for draft of proposed solution
 
   31 Mar 2014; Michał Górny <mgorny@gentoo.org> Ice-3.5.1.ebuild:
   Add support for the new PyPy slotting.
diff --git a/dev-libs/Ice/Ice-3.5.1.ebuild b/dev-libs/Ice/Ice-3.5.1.ebuild
index d0dd78f3b30c..d0fb96f7d1c8 100644
--- a/dev-libs/Ice/Ice-3.5.1.ebuild
+++ b/dev-libs/Ice/Ice-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.8 2014/03/31 20:38:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.9 2014/09/06 11:06:53 pinkbyte Exp $
 
 EAPI=5
 
@@ -16,13 +16,17 @@ SRC_URI="http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${
 	doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos"
 IUSE="doc examples +ncurses mono python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
 	>=dev-libs/openssl-0.9.8o:0
-	<sys-libs/db-6.0[cxx]
+	|| (
+		sys-libs/db:5.3[cxx]
+		sys-libs/db:5.1[cxx]
+		sys-libs/db:4.8[cxx]
+	)
 	~dev-cpp/libmcpp-2.7.2
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( $(ruby_implementation_depend ruby19) )
@@ -92,6 +96,17 @@ src_prepare() {
 	fi
 }
 
+suitable_db_version() {
+	local tested_slots="5.3 5.1 4.8"
+	for ver in ${tested_slots}; do
+		if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
+			echo ${ver}
+			return 0
+		fi
+	done
+	die "No suitable BerkDB versions found, aborting"
+}
+
 src_configure() {
 	MAKE_RULES="prefix=\"${ED}/usr\"
 		install_docdir=\"${ED}/usr/share/doc/${PF}\"
@@ -103,13 +118,14 @@ src_configure() {
 	use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
 	use debug && OPTIONS"${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes"
 
-	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir)"
+	local BERKDB_VERSION="$(suitable_db_version)"
+	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})"
 	sed -i \
 		-e "s|g++|$(tc-getCXX)|" \
 		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
 		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
 		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db)|" \
+		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
 		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"
 
 	if use python ; then
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 589259bdfaf5..f42c393b9e5f 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -5,25 +5,17 @@ AUX Ice-3.4.1-db5.patch 468 SHA256 53d5c688e6ec716c33f427b0efdca0a9da4c5d5e5b2f2
 AUX Ice-3.4.2-gcc46.patch 275 SHA256 eb1d14656f19ee919441586682308210ec9877fc814a642a84ab56a818b5c737 SHA512 f36c3097c07cf7eb77b4b7eea88dec3fddc15987392bad55fe1cbd2965161eca8ebd2d7046a176d3e93187404dcb02794d6cbba3cec76a028b23e6125012ca9e WHIRLPOOL 4a58f09edde97121b5c1b29c25e2774253ec5aae9e3736b459bea034af1f07d84dc7c6d7805d13dc682188d23d94bcb4da284294c4f6864c5647366712719a69
 DIST Ice-3.5.1.pdf 8279548 SHA256 236f509a3868301ebe688f50417f30155ffa1d330a6c7ab3ef926d40ab145150 SHA512 6fe78ed629de330c56cf260a0a78d650ad9e1507d737a8e58c616f1c61897487dae2f9fb942f1e878706dbc645cb9c672377eeef905f8764b57dd7e6f8d1c7f2 WHIRLPOOL 9fc90d131b028b74f3393df88adb8719a1fef0f829a6226e833c95bcf3bc6b53394a11e3722f0fad2a5597b2468498728310a6e974e1dcb1138fea0ab5b68b28
 DIST Ice-3.5.1.tar.gz 4799296 SHA256 989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392 SHA512 610fa317bd75e64802d1b5216db4747f86157d3246a2022397bafaefdd9b1b78d131733762003ee779065401c8a83120db65cf9b86fbf1914266309571baf58f WHIRLPOOL 0b760edcd7e3eb1220af81a2236634b86775a18050b0645e4e662bf0fb543aa14177d83e2c8659a62bd5bf6e403384998b893e84b9d547c32bbc2064b5f7de9c
-EBUILD Ice-3.5.1.ebuild 6925 SHA256 2e6531e9302ffef07cb7b500a6deb089529f6b9ce7ca50afe313aecc77498796 SHA512 49d069f2ce6b251d5c0c020274b8df3d74da94aac6a352f9b3b18ce1f6182a4a728cd407b2b6000de95d222011aaf1833af6e1ca41bf56842249e8c9e58de7a4 WHIRLPOOL f8764a46ed3eb0ccd60f6f9c2bef60f3dcf03497528a74ee94e0f31356d1b3c60f1c4c87134c503bbbf237ed1593b2e7436f8913f2865c80f8eb51321e37e119
-MISC ChangeLog 12446 SHA256 afc6b97e5d81478a86f736e3ce8d2ab0acbe979a8c63302b854776d556ff7176 SHA512 3abf7cf972f7d3f73b8fc7433dcfe9e6fae2e1f08772da74ee0e0db1eaf3420df579aae5d9116408d5deeb90758d4e7de55a021dbc7ac71e753b6cf4d1184ac7 WHIRLPOOL 77d72176eec0a78105e90c55ed06ea2dba1461ba7e93120a1f95820da001888ffab2946f176f4ce7123c786fabc7c5d7abd55af8e4e978c4d79fb3dae3c5fdab
+EBUILD Ice-3.5.1.ebuild 7302 SHA256 0eb1d180e2e1799da5d3a56e1938dffcbcbfbfc5ee0d6930d3ee3611b48694f3 SHA512 83fac37657405084b9a046e2c32df0d2762ceb4c3a83f6a6fa0678ae1ce0ffe42da2474dd6a80e50b71e267b62ff13a080116134584fa6235094e1439e8ed9a5 WHIRLPOOL eaa38e8f490295751a3455436ebfcbc49f2b07f0660004da3612612ecaed332877c38af76bc86b71af2ad98c7bf6e523f3cf72515451072f8e5c1e811949fe54
+MISC ChangeLog 12798 SHA256 b1f8a8ede8d08d36f77b35c9f54a6bf7fce02891a28b54c074c83416af71b82f SHA512 b738ee5fa51c9bb020c61a7da3a6b6e7633c5b4dc99fd5bed08703934f03972a20a13d9b581dc52300e8188e65e20251936043b50d85ac9344471dfa62a14208 WHIRLPOOL bb22d6244d804ae56a1a7c25b3f1650c37714b4ddf20f66b2617e7bf85f7b88f83b242da3559f7619de4795f64491324fec9c99207d796f530815738f18f6813
 MISC metadata.xml 339 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3 SHA512 a52d0a34b45483cbf16e870e458c31e002a62fbe4c18b7839964476696a8650c6db254392f8ff6166f4a434958eb2384cd3267f004c45726d75907983f494e60 WHIRLPOOL 8362526bb468b608b63bb17ea08ee20050904aeed1728efea1e48420fb2b5e820cedcedbecee0a37c0a2b061e0a06aa67ce6b18e148d4fbb785d528e6a80c2f3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTOdI8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO4XgP/1OyKdjOJeChmBbbS7vVIpWb
-XPGZIdksV7tWW5V5eVVDNSjQ9g8W2eGIbW0Ao967YYvHcSWXL8QsE7ef28+FiZ3O
-zTlXkEksjJSJkapjq6iw5fmg1PPQnkTUlzRnvgTkPmAnDvStI9dDZlFf49MDdGn/
-Flb8HWXbdQa5kevcwh9RwzsUrH4sQ7W2ph5uMeuyXOgBYQEFVLdMSgOkaGej+PAS
-a5N/8jvUR0HFzUtryaH32lhinUlhl0ZQBFHALBADk1wmq5YVYRSGPJNbCyaVcqOI
-OUat3FzJ2E0qRyiZUj1XjhUXzuhCAIHU4BhSVJrhyi4JkoDnsBoi7NADKOmSy+QR
-jsH6/IKPb+W5UhpkLSzpaivgRBs95+rqNLbpKGm/56ff9Xoda2yZC4nUgYxriaQn
-1W+03YtcgoIXHmAJSoP0HhNUVYjo2E4p9pFK65xKsbCqGT8tovL9j5Wvhv5/VSV6
-FuhTDVCwc8LisEDmE19LF+ZU9EK2dwQsxYfTZVduVTfk0QG5/XACekExL//hApxD
-j/sMZ+mUgatdd9c5PTYt8N7dPvmKrWLU+T2tE562G5WbGWpbAo1dy5xsXmRIYykP
-LWTe9NyNFx6GSxQLnVh7skrf9rCllyVpLkoQaIDQ/zb1znTmk2+fJL/eSYQBepj3
-vgXXMpLAwBSf95yjZriC
-=7NZ4
+iQEcBAEBCAAGBQJUCurdAAoJECo/aRed9267O74H/2l6fqnysCpVaqED1bhibF+U
+Ojz2iCbj/5iMxQtf9gy6dOVF1a+NLd1bfujY8fCT8zGzi8n+s8lbF9T4lziAR3WA
+nQcHLPUPPglt4kmebwPgtOoc6A5SfZvclBWl7XAhdwq2+d/C7ZZItYZ761Ah50jR
+T7EUafpmBI5K+JbF+tDWmZquB/l9VBTe9C0N325is4aPBL3LgnDaQxk8L1Ml6ePA
+KHjaAWBHnivWueV113VfGjOR7pnZ9V3dZyjjxCh5BZzZo9fAB9x6LcG2vYeIALAg
+C/3ZXDH6BGCtN10N5j5RaW/MbgItdLmhhMJ0QtNCDe5hffubUTFOSDk1fLpglq8=
+=0HYC
 -----END PGP SIGNATURE-----