Version bump

Package-Manager: portage-2.1.11/cvs/Linux x86_64

4 files changed, 89 insertions, 19 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 42612915fd83..073bdf1e7101 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.188 2012/05/23 19:02:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.189 2012/06/26 19:16:09 hwoarang Exp $
+
+*qbittorrent-3.0.0_beta4 (26 Jun 2012)
+*qbittorrent-2.9.10 (26 Jun 2012)
+
+  26 Jun 2012; Markos Chandras <hwoarang@gentoo.org> +qbittorrent-2.9.10.ebuild,
+  +qbittorrent-3.0.0_beta4.ebuild, -qbittorrent-3.0.0_beta2.ebuild:
+  Version bump
 
 *qbittorrent-3.0.0_beta2 (23 May 2012)
 *qbittorrent-2.9.9 (23 May 2012)
@@ -1043,4 +1050,3 @@
   08 Jan 2007; Raúl Porcel (armin76) <armin76@gentoo.org>
   +qbittorrent-0.8.0.ebuild:
   New ebuild for bug 148696
-
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 2ae2d2a6376f..a0943022581d 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,31 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+DIST qbittorrent-2.9.10.tar.gz 3571209 RMD160 d7da9d7de5b84c091910429a154327d94da15328 SHA1 13ebd38ebfbde7f8802c7a18d501cde4fd48274f SHA256 a95243faa162e7b1f147f659ef7ccca175df2c14ea68ae32b269ee73ef3bea37
 DIST qbittorrent-2.9.7.tar.gz 3606781 RMD160 c00fc50dab1c37759acbff84dc563efc8e80cc8e SHA1 ea49b3031b1517fe83826627b38cf4df725b5f4a SHA256 d706a8aff16cc6977379f5b25b842194dceef3b20efd0ca949300728c5a6a190
 DIST qbittorrent-2.9.8.tar.gz 3570031 RMD160 52859111ce07226010c4fe57ed26a08f45c1b6de SHA1 63a8996522dfe174f2435aa724dd58e282440642 SHA256 bab9adbe573a26199a0e948cc56bda4d1dde60d1f51df5611e944e87d7887f92
 DIST qbittorrent-2.9.9.tar.gz 3570289 RMD160 f51376d593396bd6543b3f2bfb41c8015d307c7e SHA1 439d5cc515ae0f4b2daf8a06e6e3c0b340e76d71 SHA256 a431d1abf257462f16656795550617136a41f4364afe741c11c2017997727e75
-DIST qbittorrent-3.0.0beta2.tar.gz 3565374 RMD160 ee3b56996831d7df8725a5b061f2f905af07eb6b SHA1 dfe4232092a14a4f377d2428c1cd4dbb9a15a0dd SHA256 bf73a8ff21751164fe01712f210b0e5d64e37054f2c5df857af0ebafea1d6036
+DIST qbittorrent-3.0.0beta4.tar.gz 3571205 RMD160 4b823faec4ef05326987e941853d61536c3d9c4d SHA1 b90c51de8b59db065b21887d4269dca406ab177d SHA256 75d79027afe91159f44af3ceec87a4afd4f21147ea1c8154decf5fe7216a6cf2
+EBUILD qbittorrent-2.9.10.ebuild 1675 RMD160 164f3ac4c9b59e19b95d39287f1cd58ceb2f550f SHA1 ec398b775c1d3677d52850b2c68bbe8b89db94ad SHA256 f0c70db01b82a62c6e7726b8b18e2b31b787f957e46a7703da932ffe66ab5702
 EBUILD qbittorrent-2.9.7.ebuild 1670 RMD160 524b7bf8bf92119b82209ff6076025fab6f441c5 SHA1 b3ce522658117e8f237dbc849f32907c5f62711e SHA256 48680b1650ee966f5a58d5f902a5a7f9d7ad49249520f1d1fbad264e30d92c72
 EBUILD qbittorrent-2.9.8.ebuild 1674 RMD160 e7cbecd8fabe56dc651a2b6d8f6c36925bd05231 SHA1 ec0cd75d5dc4b5c444200555205a28fc3b463465 SHA256 09046ed4b25d5e2da46cf8e3e07881c33c791298bbb33653b17c98bf5f0b6442
 EBUILD qbittorrent-2.9.9.ebuild 1674 RMD160 a4dddb9e5fa03b31eb3b5eaba220f4f52f4777a7 SHA1 6bc1af25dc270a99f85c0356db85527b0aad9b0f SHA256 de483356c026303866c0cea5fdc8940de96af3893b4febac8e0a571e601be40b
-EBUILD qbittorrent-3.0.0_beta2.ebuild 1680 RMD160 b9df27f3070371f930dde84a0baf1432085c532d SHA1 d4afca50f6c428df6adb9141c4c2c2f55beafae6 SHA256 45c252e9ec879387c1752c08abd1510952a41ca743264fc13a52e05338705727
+EBUILD qbittorrent-3.0.0_beta4.ebuild 1680 RMD160 f91b041daa285a700f4b36c48de7111e111eda2c SHA1 56194770972977a0452d5624176d712bad39a7bd SHA256 240bc4bc008e87a87fa33f4f08418a344a8c5de9560d6dc4065902c7cf1ca80d
 EBUILD qbittorrent-9999.ebuild 1672 RMD160 6c83a22617f41cd5c15d249f87608458c1673a9e SHA1 7357a0b36db8131f2938d0a05696d7efd9efbedd SHA256 13345dfe0873f96060c7d19c9355951e01a67ff9bc4968794dd4ec9e837c5959
-MISC ChangeLog 32179 RMD160 1a51e0c226b5cb87b86f4ef40ec4b895a36771bb SHA1 183e187583acff55583eb0e13b5595996680a966 SHA256 3966cdad3d1c078d86d641458b6af70d1e3bd7bb0602008e491423003be1ce48
+MISC ChangeLog 32417 RMD160 aa49f37160df663284f9ddd9bf95b6a4fea39d0c SHA1 68641c1c562eb276abad03d79d4ce7d91f1b7884 SHA256 ed8c00abdecad6fa0835de1b10f5df7de762b2287891b280489c9f4e99740b51
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPvTRnAAoJEPqDWhW0r/LCeIEQAIPyH+Q6aWTBEEfFaX01Uv0N
-cu7MSfNGCSOng8eu6HXaQjLvZwOm2xsxLIUnz8Z+m38Y02tgxoL7kYR6NLPxp3Wz
-aQG6jPwwdca3wYRLbZ4dus0HlYiPPrFJXJ2mJAraHOcmVXETBa5uyMz4fTMaF8Ye
-OnsAYrW0AP9MdHzK4by3t07QQXY3DovGwp/j8vXrKyFudNO7iXkcE2O04HU8Vbao
-AkVSz3Vh4SXxhNZxrJ7lqwrrpjOUzICMOHZNoO1XXR/H4iISuWdy5n1B4T//XtLz
-5PjeGSz/7D9rrUcLg8mZYlMDVWOzSHJkClaqYxKOrFyzDoFqjIIiHFU7ZYzey6RE
-VBIpfPocjD/icNvG0pHejsuqwzcbRH0XTJ1aoc8coll5Yjq3xc/Vw6v0ewXIaapx
-WfSnklhZ0YCw4hnu9BKks+qsx2BGZ/Yd9gsUU55zZDu6i9p9VIlmedkWpRhMCfCy
-27Mv92vCyyczyTBVwPjtC3F7mNc5ph00++tFFVKLj2fNBvNyLqcsMUKS1M+x76ds
-Ngy3/KikDm2XKrmVfDfVNYgMNFW+fb3F8cMSVLAJSnp2O/9EUVj1qqs4hz39/TRC
-H0B6QfJqPefe/bN1Fsc7QYwCRm/B1tXf8G+Rf6ZQuifMyhi1sJi64KSuxS/9EnKv
-Hkk45HFGPHry9tPLVU5U
-=DqRw
+iQIcBAEBCgAGBQJP6gp+AAoJEPqDWhW0r/LCqrMQALN6EjmDRTNnX7hMxoXduvjT
+9hfKyxsclovBnFmPB96FGZeM5V+BG3ZvXq26YcFIisyQoTwlPSpnSDbQdk92CkaI
+QhCH5aSV2qaMwzjMrj6DX3a/JZbSrspKF/DEmvvetpsN5Ma3rbeJx4LxnZoz5hME
+WZlv9CZ0yrql5w4xq18O+jBcJAm/gll7H4Uf3KEOLORER0EoPoko5p6p61/VRwnd
+SVawIWWUMWHpIISiKCNshrORmmPeh4uc5atUblyss8mtLyUcYeICWxfvpn2gJRPi
+FsqrIv0N2FZmE7Pyui7LQdZgFWQqp5uS12H5kFtXJwLWDlF1runNMOmf4VUE88VN
+NmvAzl8OeiTKC4qjsGZQk7uVrfA9FPMjMpZ1Bgp79nQ5eUf6E6KFNMnsOMYuHasx
+azjFFj0cFE5SizOR6FspwEEyRrHtSvUIg4kfOj0XINusqA0jeLviext0+4dqcESf
+1LBqG+qWXaVJbrso0ZzFLquvuNPibzsWSfyXpuThYXXbYRjVTmbYZ20ZkpqHveos
+NJ2l0eTvDQlpAWkK2QfIqoxVzx44mHENgxBvE5ElT5uAlRg2XBoD/Mk6rRjp6JY+
+Ke9kyhT6MRqrPn53sQoBZIi//vT+ICQkGeeGV4GoRWup+iWPCC6YW29TRJlwtgfF
+jTcSM0au/0zsnyANXnO9
+=v5fP
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/qbittorrent/qbittorrent-3.0.0_beta2.ebuild b/net-p2p/qbittorrent/qbittorrent-2.9.10.ebuild
index 4ed523975834..9b63239b4514 100644
--- a/net-p2p/qbittorrent/qbittorrent-3.0.0_beta2.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-2.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.0.0_beta2.ebuild,v 1.1 2012/05/23 19:02:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.9.10.ebuild,v 1.1 2012/06/26 19:16:09 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
diff --git a/net-p2p/qbittorrent/qbittorrent-3.0.0_beta4.ebuild b/net-p2p/qbittorrent/qbittorrent-3.0.0_beta4.ebuild
new file mode 100644
index 000000000000..b63224e23902
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-3.0.0_beta4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.0.0_beta4.ebuild,v 1.1 2012/06/26 19:16:09 hwoarang Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit python qt4-r2 versionator
+
+MY_P="${P/_/}"
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="http://www.qbittorrent.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus +X geoip"
+
+QT_MIN="4.6.1"
+# boost version so that we always have thread support
+CDEPEND="net-libs/rb_libtorrent
+	>=x11-libs/qt-core-${QT_MIN}:4
+	X? ( >=x11-libs/qt-gui-${QT_MIN}:4 )
+	dbus? ( >=x11-libs/qt-dbus-${QT_MIN}:4 )
+	dev-libs/boost"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	geoip? ( dev-libs/geoip )"
+
+DOCS="AUTHORS Changelog NEWS README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Respect LDFLAGS
+	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	local myconf
+	use X         || myconf+=" --disable-gui"
+	use geoip     || myconf+=" --disable-geoip-database"
+	use dbus 	  || myconf+=" --disable-qt-dbus"
+
+	# 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
+}