From 7dc1c9eee804aa2e6ff9514dc6fc9d1790ca15db Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sun, 18 Mar 2012 18:02:48 +0000 Subject: version bump (Portage version: 2.2.0_alpha90/cvs/Linux x86_64) --- net-p2p/qbittorrent/ChangeLog | 8 +++- net-p2p/qbittorrent/qbittorrent-2.9.6.ebuild | 62 ---------------------------- net-p2p/qbittorrent/qbittorrent-2.9.7.ebuild | 62 ++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 63 deletions(-) delete mode 100644 net-p2p/qbittorrent/qbittorrent-2.9.6.ebuild create mode 100644 net-p2p/qbittorrent/qbittorrent-2.9.7.ebuild (limited to 'net-p2p/qbittorrent') diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog index d4c8136dec61..7b5cb6636b97 100644 --- a/net-p2p/qbittorrent/ChangeLog +++ b/net-p2p/qbittorrent/ChangeLog @@ -1,6 +1,12 @@ # 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.181 2012/03/18 10:41:15 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.182 2012/03/18 18:02:48 hwoarang Exp $ + +*qbittorrent-2.9.7 (18 Mar 2012) + + 18 Mar 2012; Markos Chandras +qbittorrent-2.9.7.ebuild, + -qbittorrent-2.9.6.ebuild: + version bump *qbittorrent-2.9.6 (18 Mar 2012) diff --git a/net-p2p/qbittorrent/qbittorrent-2.9.6.ebuild b/net-p2p/qbittorrent/qbittorrent-2.9.6.ebuild deleted file mode 100644 index 681614146add..000000000000 --- a/net-p2p/qbittorrent/qbittorrent-2.9.6.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# 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-2.9.6.ebuild,v 1.1 2012/03/18 10:41:15 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} - dev-util/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 -} diff --git a/net-p2p/qbittorrent/qbittorrent-2.9.7.ebuild b/net-p2p/qbittorrent/qbittorrent-2.9.7.ebuild new file mode 100644 index 000000000000..425af2ea6074 --- /dev/null +++ b/net-p2p/qbittorrent/qbittorrent-2.9.7.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-2.9.7.ebuild,v 1.1 2012/03/18 18:02:48 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} + dev-util/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 +} -- cgit v1.2.3-65-gdbad