Remove libnotify. Has been replaced with qt-dbus API. Bug #362423

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

4 files changed, 35 insertions, 37 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index f0d285f51ec2..17849c0019d6 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.146 2011/04/06 08:21:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.147 2011/04/08 07:52:10 hwoarang Exp $
+
+  08 Apr 2011; Markos Chandras <hwoarang@gentoo.org> qbittorrent-2.7.2.ebuild,
+  qbittorrent-9999.ebuild:
+  Remove libnotify. Has been replaced with qt-dbus API. Bug #362423
 
 *qbittorrent-2.7.2 (06 Apr 2011)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index c6ab0ae7bdb6..934794471fc7 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -6,24 +6,24 @@ DIST qbittorrent-2.5.5.tar.gz 2819850 RMD160 b91d9ed0a355d87dbb5d0304026ad11af1e
 DIST qbittorrent-2.7.2.tar.gz 3157190 RMD160 dc3cdb524e864eff4cb934a7e606476c118ad885 SHA1 fdfec52385187d9895981aeb68b9081b6789362f SHA256 1e2f802c03350b19ef6610fc2048683fb22a46e7ef6638335855f516465b639c
 EBUILD qbittorrent-2.2.11.ebuild 1681 RMD160 d9bc680590ce1751d5411b51aa82fec4c714195a SHA1 4884f7865d99778ba01835275022541ebfa4ca26 SHA256 cadc4893aff16dad7e93693bd9707ab1f7e61924b24dd357aa82fc8701237a82
 EBUILD qbittorrent-2.5.5.ebuild 1747 RMD160 dd3af21cf1dfe296683f9c28703ac004df722886 SHA1 6291a1f1482c20b0ef517686af14862bdc98ae30 SHA256 4395f0944f9a51fd6ec0bf04366b5379845da8ebf3f193b2f60ee5d2a2787fce
-EBUILD qbittorrent-2.7.2.ebuild 1810 RMD160 4b08d6cef5c082391bbc4ca25b9a6d60f28e6bca SHA1 a7fd30a751a6f38b223270edbab4f7a92b66a6c8 SHA256 98ea78991592690645af95ee916e35596e49b425ae0011a6e1fe8b27783ffa82
-EBUILD qbittorrent-9999.ebuild 1801 RMD160 366e51be6029be4eee53baa16214bb867b279e34 SHA1 a89b4ff26588f0ae5cf2d9b7f7e3a9dee25a988c SHA256 f2ce9792a2768efb0025924e403046cc8fcf1b7429ef81b8f53c3d976d6260f6
-MISC ChangeLog 25737 RMD160 6cecec1c81e6a625a7d20d05aab33946e052b2c4 SHA1 b0a8f71c293bca06c536abcf0a8562e2afc08a54 SHA256 2e73237e8d7f72c335f2b72cc07204a885eac954e0917ec3f1ae6eda21959ae7
+EBUILD qbittorrent-2.7.2.ebuild 1675 RMD160 c9114941d367e1b6ace0404e8e5b169bf3716722 SHA1 5d4dcea6829f137b3f4ade71f08f825d92d7b3b4 SHA256 1459ca078722a7045680271a3a4a1c645a9910720932fae24617e164c936a6f0
+EBUILD qbittorrent-9999.ebuild 1668 RMD160 69be24b699863765ca3285d882f050d4a42bd670 SHA1 d356e66b1809b19074388756c80b28d44640c50e SHA256 7492aad364035b5012bd3fb9e4003fc7bd534984fba0bfea4c77fa7993111ee8
+MISC ChangeLog 25912 RMD160 b77ec588fa44f11ae08c0e0c799090a356ce8055 SHA1 bfc49033f8d0ded7555e44ad4fe8fdb538222103 SHA256 dc88d2494e79ca28db55837a865cdac9c9afb239f9629c533b7c05939c4d9a30
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNnBQ0AAoJEPqDWhW0r/LChNsQAKLopvHrPNCUKTcOKeMYo8Cd
-aX3L/o2UDXdcpUrTm8dNlnjCu5kbj8S74mh01hgS0BJtyVbnuS/2Od0ajtzz6y2c
-U6l/FAZ/LWUpxewHHNHLzLfnhVlFUCOzYwQrArCHTplV1EtiWX2kN9N9lDIzijRN
-0vHGpK26N2HItBH3y7ddnnnERgYlyrgyJz7/orKgkXbFjTaNKVI+0r8IzE6HYrsr
-YQlwS9Ocv5nylfzHfvw+MbU+3zTioEQZs3bUJEZIRxFeQKyXHchMJNQ/hEPCQMiC
-cpwjCvPeDcVN26Sjfl144mNCkp5DuAJjZ7ZYxQAhdSMdq5PwT0G3bWLntjYHEi3q
-xs4RxFh6fzeYg6s8WQwF/0qqUvaj0bmUYtNPx0f73MgG8l5g62PC7wty+WGXTvae
-eUik+AXxhRlr9OOnS8gB5DjsMuFQ9Ljw1OoGVhN0o0kSwb07HH5WKg8mFOyZiLO/
-oPB0e6RKEq3HzLquhJCFv+jRwkFW6cgtUIdJqYGLYd1mg9pIM6L7S/Lp9Iz/LrTs
-3gtXP0K1xl4VfJNGuQy368yJPm7BXA/PvjGkx/rCb2rRdo+OTfDiK+XgAfyBx2eB
-TkrD88opDGExyhfSy657+e2oDIkRgP+ne89mEwtKmRt87WBdAisUIOcQB22+XAJ5
-973gm8uL73dUIZfi7wQw
-=dgb/
+iQIcBAEBCgAGBQJNnrAfAAoJEPqDWhW0r/LCdHwP/1KdqSkg7PKN7yMq5KgNNJyL
+gguLj9aP+BFAW/NEUZU6PDtME6q9akQtii4b9p8ZsJVo5uR9JwR6PtlxDhDRjZo3
+1mPdcjv58neWHUazrKdH8tyysE5h6dYdh7/1mqmFZ265816BqJp4JZjod36RygaO
+jNOAU4S62HZHkYiYocTTGrmuKSVrTEW4LAe10G29aQ/0FPqlymjs9iIpcHApF50x
+BF+YitJeoWHSV6DCj5X6j/ZM/e4uVMPmp1gMV8YCY1tZuaOI82noBVkrZJURMvGV
+Ok80cRo4ElUm8TP6aLjAsiaLknLchhsntaEc4tQlL2YlArmpENI/j5FgzRbGOrmh
+4hLL7gMM9bqZaN4YxPNs57LBKx26NidnAI5ICSnr5pZ388TL63x4c/zuHb/aaBqA
+OSrsUzTPU2oigP6XFAtxFQlUqte0J2gXcF80NbeHiHX1fjEq/pIj78fMXcD0Mwgj
+cw5GQrYdkNK8aVAQAgwmnp+SOpjZtD66q6+JpoWEyWQKrqBZQnKpY6O6EToxmGji
+paosUM9C3CIDmSu1qFZIIjL3iO9DYF22HT02O7HOrXLPFjTLEjKCJT767xwTU7Ta
+AhI5IXBtYgxKcyyNVqpFWT1hHrN+2SaE4cztX6iHSiLNsMquAdBlxXhFWM5vJ6Wp
+Az/xMn1OaiiILpkoajds
+=fKa+
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/qbittorrent/qbittorrent-2.7.2.ebuild b/net-p2p/qbittorrent/qbittorrent-2.7.2.ebuild
index 76136a5307c7..51a0e41465d8 100644
--- a/net-p2p/qbittorrent/qbittorrent-2.7.2.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-2.7.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.7.2.ebuild,v 1.1 2011/04/06 08:21:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.7.2.ebuild,v 1.2 2011/04/08 07:52:10 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
 
-inherit python confutils qt4-r2 versionator
+inherit python qt4-r2 versionator
 
 MY_P="${P/_/}"
 DESCRIPTION="BitTorrent client in C++ and Qt"
@@ -15,28 +15,25 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+X geoip libnotify"
+IUSE="dbus +X geoip"
 
 QT_MIN="4.7.1"
 # boost version so that we always have thread support
 CDEPEND="net-libs/rb_libtorrent
 	>=x11-libs/qt-core-${QT_MIN}:4
-	>=x11-libs/qt-dbus-${QT_MIN}:4
-	X? ( >=x11-libs/qt-gui-${QT_MIN}:4
-		libnotify? ( >=x11-libs/qt-gui-${QT_MIN}:4[glib] ) )
+	X? ( >=x11-libs/qt-gui-${QT_MIN}:4 )
+	dbus? ( >=x11-libs/qt-dbus-${QT_MIN}:4 )
 	dev-libs/boost"
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig"
 RDEPEND="${CDEPEND}
-	geoip? ( dev-libs/geoip )
-	libnotify? ( x11-libs/libnotify )"
+	geoip? ( dev-libs/geoip )"
 
 DOCS="AUTHORS Changelog NEWS README TODO"
 
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	confutils_use_depend_all libnotify X
 	python_set_active_version 2
 	python_pkg_setup
 }
@@ -51,7 +48,7 @@ src_configure() {
 	local myconf
 	use X         || myconf+=" --disable-gui"
 	use geoip     || myconf+=" --disable-geoip-database"
-	use libnotify || myconf+=" --disable-libnotify"
+	use dbus 	  || myconf+=" --disable-qt-dbus"
 
 	# slotted boost detection, bug #309415
 	BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")"
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 362959abf3e6..76da8522b2bb 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.2 2011/03/04 19:56:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.3 2011/04/08 07:52:10 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
 
-inherit python confutils qt4-r2 versionator subversion
+inherit python qt4-r2 versionator subversion
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="http://www.qbittorrent.org/"
@@ -15,26 +15,23 @@ SLOT="0"
 ESVN_REPO_URI="https://qbittorrent.svn.sourceforge.net/svnroot/qbittorrent/trunk"
 KEYWORDS=""
 
-IUSE="+X geoip libnotify"
+IUSE="dbus +X geoip"
 
 QT_MIN="4.7.1"
 # boost version so that we always have thread support
 CDEPEND="net-libs/rb_libtorrent
 	>=x11-libs/qt-core-${QT_MIN}:4
-	>=x11-libs/qt-dbus-${QT_MIN}:4
-	X? ( >=x11-libs/qt-gui-${QT_MIN}:4
-		libnotify? ( >=x11-libs/qt-gui-${QT_MIN}:4[glib] ) )
+	X? ( >=x11-libs/qt-gui-${QT_MIN}:4 )
+	dbus? ( >=x11-libs/qt-dbus-${QT_MIN}:4 )
 	dev-libs/boost"
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig"
 RDEPEND="${CDEPEND}
-	geoip? ( dev-libs/geoip )
-	libnotify? ( x11-libs/libnotify )"
+	geoip? ( dev-libs/geoip )"
 
 DOCS="AUTHORS Changelog NEWS README TODO"
 
 pkg_setup() {
-	confutils_use_depend_all libnotify X
 	python_set_active_version 2
 	python_pkg_setup
 }
@@ -49,7 +46,7 @@ src_configure() {
 	local myconf
 	use X         || myconf+=" --disable-gui"
 	use geoip     || myconf+=" --disable-geoip-database"
-	use libnotify || myconf+=" --disable-libnotify"
+	use dbus      || myconf+=" --disable-qt-dbus"
 
 	# slotted boost detection, bug #309415
 	BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")"