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, 30 deletions

diff --git a/net-p2p/bitcoin-qt/ChangeLog b/net-p2p/bitcoin-qt/ChangeLog
index afb1c60bb2d5..92c7505809e7 100644
--- a/net-p2p/bitcoin-qt/ChangeLog
+++ b/net-p2p/bitcoin-qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/bitcoin-qt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.49 2013/01/04 02:42:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.50 2013/01/08 01:59:36 blueness Exp $
+
+  08 Jan 2013; Anthony G. Basile <blueness@gentoo.org> bitcoin-qt-0.7.0.ebuild,
+  bitcoin-qt-0.7.2.ebuild, bitcoin-qt-0.7.2_rc2.ebuild:
+  Remove boost versioning for 0.7.*.  They could all probably use it.  Bug
+  #445180
 
 *bitcoin-qt-0.7.2 (04 Jan 2013)
 
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0.ebuild
index f15ccbc7e522..cad85eb23d37 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-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/bitcoin-qt/bitcoin-qt-0.7.0.ebuild,v 1.2 2012/10/29 02:20:08 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0.ebuild,v 1.3 2013/01/08 01:59:36 blueness Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="$IUSE 1stclassmsg dbus +eligius ipv6 +qrcode upnp"
 
 RDEPEND="
-	>=dev-libs/boost-1.41.0
+	>=dev-libs/boost-1.41.0[threads(+)]
 	dev-libs/openssl[-bindist]
 	qrcode? (
 		media-gfx/qrencode
@@ -74,7 +74,6 @@ src_prepare() {
 
 src_configure() {
 	OPTS=()
-	local BOOST_PKG BOOST_VER
 
 	use dbus && OPTS+=("USE_DBUS=1")
 	if use upnp; then
@@ -89,12 +88,6 @@ src_configure() {
 	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}")"
-	OPTS+=("BOOST_INCLUDE_PATH=/usr/include/boost-${BOOST_VER}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
 	eqmake4 "${PN}.pro" "${OPTS[@]}"
 }
 
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.7.2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.7.2.ebuild
index 4119c188222f..35f704ed6cce 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.7.2.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-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/bitcoin-qt/bitcoin-qt-0.7.2.ebuild,v 1.1 2013/01/04 02:42:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.7.2.ebuild,v 1.2 2013/01/08 01:59:36 blueness Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="$IUSE 1stclassmsg dbus +eligius ipv6 +qrcode upnp"
 
 RDEPEND="
-	>=dev-libs/boost-1.41.0
+	>=dev-libs/boost-1.41.0[threads(+)]
 	dev-libs/openssl[-bindist]
 	qrcode? (
 		media-gfx/qrencode
@@ -76,7 +76,6 @@ src_prepare() {
 
 src_configure() {
 	OPTS=()
-	local BOOST_PKG BOOST_VER
 
 	use dbus && OPTS+=("USE_DBUS=1")
 	if use upnp; then
@@ -91,12 +90,6 @@ src_configure() {
 	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}")"
-	OPTS+=("BOOST_INCLUDE_PATH=/usr/include/boost-${BOOST_VER}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
 	eqmake4 "${PN}.pro" "${OPTS[@]}"
 }
 
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.7.2_rc2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.7.2_rc2.ebuild
index 6610d05cb4a5..f8f6dcc97301 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.7.2_rc2.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-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/bitcoin-qt/bitcoin-qt-0.7.2_rc2.ebuild,v 1.1 2012/12/06 13:29:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.7.2_rc2.ebuild,v 1.2 2013/01/08 01:59:36 blueness Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="$IUSE 1stclassmsg dbus +eligius ipv6 +qrcode upnp"
 
 RDEPEND="
-	>=dev-libs/boost-1.41.0
+	>=dev-libs/boost-1.41.0[threads(+)]
 	dev-libs/openssl[-bindist]
 	qrcode? (
 		media-gfx/qrencode
@@ -76,7 +76,6 @@ src_prepare() {
 
 src_configure() {
 	OPTS=()
-	local BOOST_PKG BOOST_VER
 
 	use dbus && OPTS+=("USE_DBUS=1")
 	if use upnp; then
@@ -91,12 +90,6 @@ src_configure() {
 	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}")"
-	OPTS+=("BOOST_INCLUDE_PATH=/usr/include/boost-${BOOST_VER}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
 	eqmake4 "${PN}.pro" "${OPTS[@]}"
 }