Remove old. Version bump. Patch applied upstream. Add zziplib dependency.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

7 files changed, 34 insertions, 134 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index b3897af0b10f..2b219a7364ed 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.58 2009/07/10 20:26:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.59 2009/08/15 23:21:49 yngwin Exp $
+
+*qbittorrent-1.4.0 (15 Aug 2009)
+
+  15 Aug 2009; Ben de Groot <yngwin@gentoo.org> qbittorrent-1.0.0.ebuild,
+  -qbittorrent-1.2.1.ebuild, -qbittorrent-1.3.2.ebuild,
+  -qbittorrent-1.3.3.ebuild, qbittorrent-1.3.3-r1.ebuild,
+  +qbittorrent-1.4.0.ebuild:
+  Remove old. Version bump. Patch applied upstream. Add zziplib dependency.
 
 *qbittorrent-1.3.3-r1 (10 Jul 2009)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 3235db78a9cb..58ea4797a39f 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,12 +1,9 @@
 AUX qbittorrent-1.3.3-no-strip.patch 459 RMD160 be42e1397c7eed46acd7405e37e8ffa49b516d5c SHA1 8bb8d86b7f104d1876c49e96dc4f2023faf68bfc SHA256 db04273d211b8fd8d190f301e1671bb441eb523b040a56fe6fada8920a6d18c1
 DIST qbittorrent-1.0.0.tar.gz 1384049 RMD160 86266a164b0b36276ca766fe9aae8759e6a2e28b SHA1 d498f0f537a49b8f7421284127e05af02f62ba1a SHA256 a247223dd2d3e2490d5c3cce4764d40aaf486548bf77835729d42e82e12aad25
-DIST qbittorrent-1.2.1.tar.gz 1641921 RMD160 a09c6f96c356774c1c5cd9f615277029a8b1f744 SHA1 a38e79cf665a044e26fbec508d1407f65a4250a9 SHA256 8f702d337be25a6dba055bc87c557333950803ccff13715d92139e7cfbd9797c
-DIST qbittorrent-1.3.2.tar.gz 1660128 RMD160 d96f8e8982778a8ed9c86c78bfb0a8ff626a75b5 SHA1 2c4601fc0a87e17fa2ed64ef08c4beaf7b83920b SHA256 f0d269424272ab1d6ce2a161ff7c01ff8ced63f5a7cf25616bbde02298329a5d
 DIST qbittorrent-1.3.3.tar.gz 1667700 RMD160 fa8c52a67443e9ff0676150a0f984fc1b5eeef59 SHA1 69eeda56757e9708ecfede424b628c5eaaaa0d48 SHA256 3a8adf958a727e1fcc2fbdc03a0691209f0b60f75b6bb385c9c1aca27dceb964
-EBUILD qbittorrent-1.0.0.ebuild 1113 RMD160 101a6abb09c9d5f52a3277763080ff040fcb2f77 SHA1 f0dc08e27dee1fcb229d3b9d291cf1d16334bb52 SHA256 f19480f4fe1cb695114951d608ed47162db7656bae504a76879f71d1279b291f
-EBUILD qbittorrent-1.2.1.ebuild 1234 RMD160 e5820920fe79ce21b828d1d5ab6b66a8f8d48180 SHA1 aad5fbc88e9efa41197a0c896f05321625f08cad SHA256 347c6b41779560b6dd910ab11266b0100dd9dc856dd74e99cee32f91b8beb768
-EBUILD qbittorrent-1.3.2.ebuild 1228 RMD160 91b9fc9ee90e4d139f43a41e9867e7a494eb0eec SHA1 26aaa99df3cc7dc136c2e52f76cc88f39e9dc4a0 SHA256 9b6dbbfc9bb9ed347890962f0d12b1c96b7d64a37ee7bdded8aea5634ef65ae7
-EBUILD qbittorrent-1.3.3-r1.ebuild 1223 RMD160 a381bf24b2827dd9ceb60246d28cac418dbfbba9 SHA1 5932122980a5f798a030a63f3e51fa67378ff6fc SHA256 7ba32001ed7af0e3507abf682bb870c2f366212c4dd96f8a986d9aeaccb0301f
-EBUILD qbittorrent-1.3.3.ebuild 1228 RMD160 f196a22924fb70e51ec70a582d4bbd30d0ebc488 SHA1 d66122e3d43a5d8fd22ea268d65c30a487f43b4d SHA256 a83ab525c19e2be5226fa6e6ccbb5f20c6fa8927beca0995491c07633877fe6f
-MISC ChangeLog 9780 RMD160 737b42e5389f91213d1cb667ef1390ea94cb6a64 SHA1 e7ba7551dbdffc3d23a88bd1098d07442767a797 SHA256 735b3d65c01fe12f80d25e5299689bc7d410cb0a383c0d3380f0b4b9dd7f6a4d
+DIST qbittorrent-1.4.0.tar.gz 1607340 RMD160 3b31bdf772e661c90baf00705f9a4b1006e293d0 SHA1 d2af275a73f50a73b558074d984c3fb21a0299b8 SHA256 0470368e698dd46af5644ea6c7d76524717b5e0a48b4000a88ab0a0466a39592
+EBUILD qbittorrent-1.0.0.ebuild 1094 RMD160 025dfcd209560b2a0b6bde48c53f4e4cad45563d SHA1 a5802dd821358df654dbabd7bfc0c26602bad3b1 SHA256 a0d75bed365bc54a1c44bc8477159fe1b2c3f058f1f76981c395f07c5129a4a8
+EBUILD qbittorrent-1.3.3-r1.ebuild 1237 RMD160 86aee2c74c5ad031b3376529c9d17a60cd960871 SHA1 9f84a91d66a3e3f9c17d02135d329c30ab57a514 SHA256 6633ef108363330508fdc7496f607213b769171c15e91e5e958b935c9ecb3e10
+EBUILD qbittorrent-1.4.0.ebuild 1097 RMD160 0c09c11377ce23d9e7b29c33ab84043cf74998e8 SHA1 d5b5870e1de445d44cd0d1b017d11ca1a8dd9dd5 SHA256 e1e2db78b43b8ffcad2d676654c4f6a7e6884582880990c975c0664136ee683c
+MISC ChangeLog 10106 RMD160 f617d5a7974c28a7a29dc0fa488ab5d163803403 SHA1 5dabc82f044297dcbb5edbea35ce6a84f5b26b2e SHA256 1a6972cd867e68fbfe144280b1b236282f89ab65c64f6d4613173094ff49c5b8
 MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c
diff --git a/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild b/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild
index cd720e0a96a7..d5f76925d2eb 100644
--- a/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.6 2009/03/07 16:13:27 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild,v 1.7 2009/08/15 23:21:49 yngwin Exp $
 
 EAPI="1"
 
@@ -8,7 +8,7 @@ inherit eutils qt4 multilib
 
 MY_P="${P/_/}"
 
-DESCRIPTION="BitTorrent client in C++ and Qt."
+DESCRIPTION="A C++/Qt4 BitTorrent client"
 HOMEPAGE="http://www.qbittorrent.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
@@ -19,9 +19,10 @@ KEYWORDS="~amd64 x86"
 IUSE=""
 
 # boost version so that we always have threads support
-DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 )
-	>=net-libs/rb_libtorrent-0.13
+DEPEND="x11-libs/qt-gui:4
+	~net-libs/rb_libtorrent-0.13
 	>=dev-libs/boost-1.34.1
+	dev-libs/zziplib
 	net-misc/curl
 	dev-cpp/commoncpp2"
 RDEPEND="${DEPEND}
diff --git a/net-p2p/qbittorrent/qbittorrent-1.2.1.ebuild b/net-p2p/qbittorrent/qbittorrent-1.2.1.ebuild
deleted file mode 100644
index 2992f8c15264..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-1.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.2.1.ebuild,v 1.2 2009/03/07 16:13:27 betelgeuse 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=""
-
-# boost version so that we always have threads support
-DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 )
-	>=net-libs/rb_libtorrent-0.13.1
-	>=dev-libs/boost-1.34.1
-	net-misc/curl
-	dev-cpp/commoncpp2"
-RDEPEND="${DEPEND}
-	>=dev-lang/python-2.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Respect LDFLAGS
-	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
-}
-
-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
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-1.3.3-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-1.3.3-r1.ebuild
index d37d8d241bdf..3a8696b924ac 100644
--- a/net-p2p/qbittorrent/qbittorrent-1.3.3-r1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-1.3.3-r1.ebuild
@@ -1,17 +1,14 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.3.3-r1.ebuild,v 1.1 2009/07/10 20:26:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.3.3-r1.ebuild,v 1.2 2009/08/15 23:21:49 yngwin Exp $
 
 EAPI="2"
-
 inherit eutils qt4 multilib
 
 MY_P="${P/_/}"
-
-DESCRIPTION="BitTorrent client in C++ and Qt."
+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"
@@ -22,11 +19,14 @@ IUSE=""
 DEPEND=" x11-libs/qt-gui:4
 	>=net-libs/rb_libtorrent-0.14.1
 	>=dev-libs/boost-1.34.1
+	dev-libs/zziplib
 	net-misc/curl
 	dev-cpp/commoncpp2"
 RDEPEND="${DEPEND}
 	>=dev-lang/python-2.3"
 
+S="${WORKDIR}/${MY_P}"
+
 PATCHES=(
 	"${FILESDIR}/${P}-no-strip.patch"
 )
diff --git a/net-p2p/qbittorrent/qbittorrent-1.3.3.ebuild b/net-p2p/qbittorrent/qbittorrent-1.3.3.ebuild
deleted file mode 100644
index c865b49034fb..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-1.3.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.3.3.ebuild,v 1.1 2009/04/08 09:32:11 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=""
-
-# boost version so that we always have thread support
-DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )
-	>=net-libs/rb_libtorrent-0.14.1
-	>=dev-libs/boost-1.34.1
-	net-misc/curl
-	dev-cpp/commoncpp2"
-RDEPEND="${DEPEND}
-	>=dev-lang/python-2.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Respect LDFLAGS
-	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
-}
-
-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
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-1.3.2.ebuild b/net-p2p/qbittorrent/qbittorrent-1.4.0.ebuild
index bfb13111029c..f977f3026a4f 100644
--- a/net-p2p/qbittorrent/qbittorrent-1.3.2.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-1.4.0.ebuild
@@ -1,17 +1,14 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.3.2.ebuild,v 1.1 2009/03/09 13:06:48 armin76 Exp $
-
-EAPI="1"
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.4.0.ebuild,v 1.1 2009/08/15 23:21:49 yngwin Exp $
 
+EAPI="2"
 inherit eutils qt4 multilib
 
 MY_P="${P/_/}"
-
-DESCRIPTION="BitTorrent client in C++ and Qt."
+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"
@@ -19,29 +16,26 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # boost version so that we always have thread support
-DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )
+DEPEND=" x11-libs/qt-gui:4
 	>=net-libs/rb_libtorrent-0.14.1
 	>=dev-libs/boost-1.34.1
+	dev-libs/zziplib
 	net-misc/curl
 	dev-cpp/commoncpp2"
 RDEPEND="${DEPEND}
 	>=dev-lang/python-2.3"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
 	# Respect LDFLAGS
 	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
+	qt4_src_prepare
 }
 
-src_compile() {
+src_configure() {
 	# 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"
+	./configure --prefix=/usr --qtdir=/usr || die "configure failed"
 }
 
 src_install() {