[gentoo-commits] gentoo-x86 commit in net-p2p/qbittorrent: ChangeLog qbittorrent-2.2.2.ebuild qbittorrent-2.1.6.ebuild qbittorrent-1.5.5.ebuild qbittorrent-2.2.0.ebuild

[gentoo-commits] gentoo-x86 commit in net-p2p/qbittorrent: ChangeLog qbittorrent-2.2.2.ebuild qbittorrent-2.1.6.ebuild qbittorrent-1.5.5.ebuild qbittorrent-2.2.0.ebuild

[Ben de Groot (yngwin)]

yngwin      10/03/26 21:46:04

  Modified:             ChangeLog qbittorrent-2.2.2.ebuild
  Removed:              qbittorrent-2.1.6.ebuild qbittorrent-1.5.5.ebuild
                        qbittorrent-2.2.0.ebuild
  Log:
  Remove old versions. Add slotted boost detection to fix bug #309415.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.77                 net-p2p/qbittorrent/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/qbittorrent/ChangeLog?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/qbittorrent/ChangeLog?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/qbittorrent/ChangeLog?r1=1.76&r2=1.77

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ChangeLog	25 Mar 2010 18:12:10 -0000	1.76
+++ ChangeLog	26 Mar 2010 21:46:04 -0000	1.77
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.76 2010/03/25 18:12:10 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.77 2010/03/26 21:46:04 yngwin Exp $
+
+  26 Mar 2010; Ben de Groot <yngwin@gentoo.org> -qbittorrent-1.5.5.ebuild,
+  -qbittorrent-2.1.6.ebuild, -qbittorrent-2.2.0.ebuild,
+  qbittorrent-2.2.2.ebuild:
+  Remove old versions. Add slotted boost detection to fix bug #309415.
 
 *qbittorrent-2.2.2 (25 Mar 2010)
 



1.2                  net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild?r1=1.1&r2=1.2

Index: qbittorrent-2.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qbittorrent-2.2.2.ebuild	25 Mar 2010 18:12:10 -0000	1.1
+++ qbittorrent-2.2.2.ebuild	26 Mar 2010 21:46:04 -0000	1.2
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild,v 1.1 2010/03/25 18:12:10 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild,v 1.2 2010/03/26 21:46:04 yngwin Exp $
 
 EAPI="2"
-inherit confutils qt4-r2
+inherit confutils qt4-r2 versionator
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="http://www.qbittorrent.org/"
@@ -45,7 +45,16 @@
 	use geoip     || myconf+=" --disable-geoip-database"
 	use libnotify || myconf+=" --disable-libnotify"
 
+	# slotted boost detection, bug #309415
+	BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+	myconf+=" --with-libboost-inc=/usr/include/boost-${BOOST_VER}"
+
 	# econf fails, since this uses qconf
 	./configure --prefix=/usr --qtdir=/usr ${myconf} || die "configure failed"
 	eqmake4
+
+	# link to the correct slotted boost version, bug #309415
+	sed -i "s/-mt/-mt-${BOOST_VER}/g" conf.pri
 }