Version bump, fix qt4 split dependencies, bug #217181

Package-Manager: portage-2.1.5.3

4 files changed, 65 insertions, 6 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index ced514c0d178..a7b56f2e8463 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.35 2008/04/19 17:13:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.36 2008/06/03 10:44:16 armin76 Exp $
+
+*qbittorrent-1.1.0_beta1 (03 Jun 2008)
+
+  03 Jun 2008; Raúl Porcel <armin76@gentoo.org> qbittorrent-1.0.0.ebuild,
+  +qbittorrent-1.1.0_beta1.ebuild:
+  Version bump, fix qt4 split dependencies, bug #217181
 
   19 Apr 2008; Raúl Porcel <armin76@gentoo.org> qbittorrent-0.9.3.ebuild,
   qbittorrent-1.0.0.ebuild:
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 780f08cf9a28..ed1fcd26a50b 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,6 +1,8 @@
 DIST qbittorrent-0.9.3.tar.gz 836332 RMD160 865ae153ce7716cb4720ece6746c8d55dc9764ff SHA1 b8ebe28a3ce6c0d789b50faf56197e8df891191a SHA256 532308bf882b9f55876599b4bcaefbc31bb45ea9ff62ce6805c2688c06f03ca2
 DIST qbittorrent-1.0.0.tar.gz 1384049 RMD160 86266a164b0b36276ca766fe9aae8759e6a2e28b SHA1 d498f0f537a49b8f7421284127e05af02f62ba1a SHA256 a247223dd2d3e2490d5c3cce4764d40aaf486548bf77835729d42e82e12aad25
+DIST qbittorrent-1.1.0beta1.tar.gz 1505529 RMD160 245c20dc72c98c791e062304a873b1f20aace4bf SHA1 b30a98f7e9f4eec1074507235c3e213f7c9de225 SHA256 390203417c959ac6e0486e4b33ac2670e9414d4ab6cc5c4ffff86eaea3645c98
 EBUILD qbittorrent-0.9.3.ebuild 1160 RMD160 e805020327733a51c53000d4758fdb9f621d1fa8 SHA1 a99f50a36603c94be29445eaeef02e43a33f8f85 SHA256 70eb2d01651c3c908f3e5da71cb90c5ae53e306daa95677fefebb566162ae829
-EBUILD qbittorrent-1.0.0.ebuild 1262 RMD160 31f681f396add006643b8d9caad3cce78bacff3f SHA1 d45b384855551c14dac64805e736289af304ae16 SHA256 d052d2fc88c5cc8c967211e32822aa2eef7e7f8657b24f02ea38ca424af8b7bf
-MISC ChangeLog 5796 RMD160 b5cac56860fb0c9fda713dba09b584cea1ae12ca SHA1 7b2098e2f344458e7790293128875d3b30d74e18 SHA256 3c816ed3632b28292f3e402b39d28a5b2a50545152933bb011989698c636f1ad
+EBUILD qbittorrent-1.0.0.ebuild 1294 RMD160 6cda3923fbd68815f33702d498cd6c12375764c0 SHA1 3f8aa85b4de9a267969666fc5acb2c8ac6af8a5d SHA256 ffcb0ff11bd2801002eb617f577f3258aa96741c444d153598998597dec217fc
+EBUILD qbittorrent-1.1.0_beta1.ebuild 1306 RMD160 1962fd6aaf8719d643eea5371ef0335787794f22 SHA1 e438c7bfd4bcf86ebe3ebbfe34257906be0b04af SHA256 ba68a6ac716f05ddd677011d39ef66e2b885d2f8d27580990da2e07007849de0
+MISC ChangeLog 6003 RMD160 8847fab103c74e6bb0db1acc9824ff9058141912 SHA1 e74b1c04df99e0bd3cc21f5d4e52398bfe11aca7 SHA256 dc4f9950a3af59b4d41f8c7a030c8abfba52592db59fe4e7894d76a9332e6408
 MISC metadata.xml 222 RMD160 0dc4b04f31dcc89402f87c352327fe327b3cf31f SHA1 540337d5841f15b43186e5858f9e24032567de08 SHA256 713b9d1548682d5c1c3686a7b0711acf065a8fa4f386883ace90359d3dceb966
diff --git a/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild b/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild
index fc26e21f7012..665ddb01a596 100644
--- a/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild,v 1.2 2008/04/19 17:13:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild,v 1.3 2008/06/03 10:44:16 armin76 Exp $
+
+EAPI="1"
 
 inherit eutils qt4 multilib
 
@@ -16,8 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=net-libs/rb_libtorrent-0.13
-	$(qt4_min_version 4.2)
+DEPEND="|| ( x11-libs/qt-gui:4 >=x11-libs/qt-4.2:4 )
+	>=net-libs/rb_libtorrent-0.13
 	dev-libs/boost
 	net-misc/curl
 	dev-cpp/commoncpp2"
diff --git a/net-p2p/qbittorrent/qbittorrent-1.1.0_beta1.ebuild b/net-p2p/qbittorrent/qbittorrent-1.1.0_beta1.ebuild
new file mode 100644
index 000000000000..9fad25a1aa35
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-1.1.0_beta1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.1.0_beta1.ebuild,v 1.1 2008/06/03 10:44:16 armin76 Exp $
+
+EAPI="1"
+
+inherit eutils qt4 multilib
+
+MY_P="${P/_/}"
+
+DESCRIPTION="BitTorrent client in C++ and Qt."
+HOMEPAGE="http://www.qbittorrent.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="|| ( x11-libs/qt-gui:4 >=x11-libs/qt-4.3:4 )
+	>=net-libs/rb_libtorrent-0.13_p2335
+	dev-libs/boost
+	net-misc/curl
+	dev-cpp/commoncpp2"
+RDEPEND="${DEPEND}
+	>=dev-lang/python-2.3"
+
+pkg_setup() {
+	# We need boost built with threads
+	if ! built_with_use --missing true "dev-libs/boost" threads; then
+		eerror "${PN} needs dev-libs/boost built with threads USE flag"
+		die "dev-libs/boost is built without threads USE flag"
+	fi
+}
+
+src_compile() {
+	# econf fails, since this uses qconf
+	./configure --prefix=/usr --qtdir=/usr \
+		--with-libtorrent-inc=/usr/include \
+		--with-libtorrent-lib=/usr/$(get_libdir) \
+		|| die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	dodoc AUTHORS Changelog NEWS README TODO
+}