Remove boost versioning for 0.7.*. They could all probably use it. Bug #445180

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

4 files changed, 14 insertions, 33 deletions

diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog
index 2024a90de27a..91169f90838c 100644
--- a/net-p2p/bitcoind/ChangeLog
+++ b/net-p2p/bitcoind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/bitcoind
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.53 2013/01/04 02:26:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.54 2013/01/08 02:13:58 blueness Exp $
+
+  08 Jan 2013; Anthony G. Basile <blueness@gentoo.org> bitcoind-0.7.0.ebuild,
+  bitcoind-0.7.2.ebuild, bitcoind-0.7.2_rc2.ebuild:
+  Remove boost versioning for 0.7.*.  They could all probably use it.  Bug
+  #445180
 
 *bitcoind-0.7.2 (04 Jan 2013)
 
diff --git a/net-p2p/bitcoind/bitcoind-0.7.0.ebuild b/net-p2p/bitcoind/bitcoind-0.7.0.ebuild
index 1c504a95174c..3117cea9b351 100644
--- a/net-p2p/bitcoind/bitcoind-0.7.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.7.0.ebuild,v 1.2 2012/10/29 01:46:15 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.7.0.ebuild,v 1.3 2013/01/08 02:13:58 blueness Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+eligius examples ipv6 logrotate upnp"
 
 RDEPEND="
-	>=dev-libs/boost-1.41.0
+	>=dev-libs/boost-1.41.0[threads(+)]
 	dev-libs/openssl[-bindist]
 	logrotate? (
 		app-admin/logrotate
@@ -49,7 +49,6 @@ src_prepare() {
 
 src_compile() {
 	OPTS=()
-	local BOOST_PKG BOOST_VER BOOST_INC
 
 	OPTS+=("DEBUGFLAGS=")
 	OPTS+=("CXXFLAGS=${CXXFLAGS}")
@@ -58,13 +57,6 @@ src_compile() {
 	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
 	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
 
-	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}"
-	OPTS+=("BOOST_INCLUDE_PATH=${BOOST_INC}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
 	if use upnp; then
 		OPTS+=(USE_UPNP=1)
 	else
diff --git a/net-p2p/bitcoind/bitcoind-0.7.2.ebuild b/net-p2p/bitcoind/bitcoind-0.7.2.ebuild
index 6db35c65dfe0..2d2350a00c39 100644
--- a/net-p2p/bitcoind/bitcoind-0.7.2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2010-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.7.2.ebuild,v 1.1 2013/01/04 02:26:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.7.2.ebuild,v 1.2 2013/01/08 02:13:58 blueness Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+eligius examples ipv6 logrotate upnp"
 
 RDEPEND="
-	>=dev-libs/boost-1.41.0
+	>=dev-libs/boost-1.41.0[threads(+)]
 	dev-libs/openssl[-bindist]
 	logrotate? (
 		app-admin/logrotate
@@ -48,7 +48,6 @@ src_prepare() {
 
 src_compile() {
 	OPTS=()
-	local BOOST_PKG BOOST_VER BOOST_INC
 
 	OPTS+=("DEBUGFLAGS=")
 	OPTS+=("CXXFLAGS=${CXXFLAGS}")
@@ -57,13 +56,6 @@ src_compile() {
 	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
 	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
 
-	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}"
-	OPTS+=("BOOST_INCLUDE_PATH=${BOOST_INC}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
 	if use upnp; then
 		OPTS+=(USE_UPNP=1)
 	else
diff --git a/net-p2p/bitcoind/bitcoind-0.7.2_rc2.ebuild b/net-p2p/bitcoind/bitcoind-0.7.2_rc2.ebuild
index e96ad089e012..82213f9b90c4 100644
--- a/net-p2p/bitcoind/bitcoind-0.7.2_rc2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.7.2_rc2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2010-2012 Gentoo Foundation
+# Copyright 2010-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.7.2_rc2.ebuild,v 1.1 2012/12/06 13:21:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.7.2_rc2.ebuild,v 1.2 2013/01/08 02:13:58 blueness Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+eligius examples ipv6 logrotate upnp"
 
 RDEPEND="
-	>=dev-libs/boost-1.41.0
+	>=dev-libs/boost-1.41.0[threads(+)]
 	dev-libs/openssl[-bindist]
 	logrotate? (
 		app-admin/logrotate
@@ -48,7 +48,6 @@ src_prepare() {
 
 src_compile() {
 	OPTS=()
-	local BOOST_PKG BOOST_VER BOOST_INC
 
 	OPTS+=("DEBUGFLAGS=")
 	OPTS+=("CXXFLAGS=${CXXFLAGS}")
@@ -57,13 +56,6 @@ src_compile() {
 	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
 	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
 
-	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}"
-	OPTS+=("BOOST_INCLUDE_PATH=${BOOST_INC}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
 	if use upnp; then
 		OPTS+=(USE_UPNP=1)
 	else