pesa        14/05/24 22:53:34

  Modified:             qbittorrent-9999.ebuild metadata.xml ChangeLog
  Added:                qbittorrent-3.1.9.2-r1.ebuild
  Removed:              qbittorrent-3.0.11-r1.ebuild
                        qbittorrent-3.1.8.ebuild qbittorrent-2.9.7.ebuild
                        qbittorrent-3.1.9.2.ebuild qbittorrent-3.1.4.ebuild
                        qbittorrent-3.1.5.ebuild qbittorrent-3.1.3.ebuild
                        qbittorrent-3.1.9.ebuild
  Log:
  Depend on latest qtsingleapplication in order to fix bug 507998. Several 
ebuild enhancements. Remove old versions.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
0xDADED6B2671CB57D!)

Revision  Changes    Path
1.16                 net-p2p/qbittorrent/qbittorrent-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild?rev=1.16&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild?rev=1.16&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild?r1=1.15&r2=1.16

Index: qbittorrent-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qbittorrent-9999.ebuild     19 Apr 2014 18:54:21 -0000      1.15
+++ qbittorrent-9999.ebuild     24 May 2014 22:53:34 -0000      1.16
@@ -1,56 +1,55 @@
 # Copyright 1999-2014 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.15 
2014/04/19 18:54:21 hwoarang Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.16 
2014/05/24 22:53:34 pesa Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-EGIT_REPO_URI="git://github.com/${PN}/qBittorrent.git
-https://github.com/${PN}/qBittorrent.git";
-
-inherit python-r1 qt4-r2 git-2
+inherit python-r1 qt4-r2 git-r3
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="http://www.qbittorrent.org/";
+EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git";
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="dbus +X geoip"
+IUSE="dbus debug geoip +X"
 
-# python-2 is a runtime dep only, for the search engine (see INSTALL file)
-CDEPEND="dev-libs/boost
+# geoip and python are runtime deps only (see INSTALL file)
+CDEPEND="
+       dev-libs/boost:=
        dev-qt/qtcore:4
-       net-libs/rb_libtorrent
-       >=dev-qt/qtsingleapplication-2.6.1_p20130904[X?]
+       >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?]
+       >=net-libs/rb_libtorrent-0.16.10
+       dbus? ( dev-qt/qtdbus:4 )
        X? ( dev-qt/qtgui:4 )
-
-       dbus? ( dev-qt/qtdbus:4 )"
+"
 DEPEND="${CDEPEND}
-       virtual/pkgconfig"
+       virtual/pkgconfig
+"
 RDEPEND="${CDEPEND}
        ${PYTHON_DEPS}
-       geoip? ( dev-libs/geoip )"
+       geoip? ( dev-libs/geoip )
+"
 
-DOCS="AUTHORS Changelog NEWS README TODO"
-
-src_prepare() {
-       # Respect LDFLAGS
-       sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
-       qt4-r2_src_prepare
-}
+DOCS=(AUTHORS Changelog README TODO)
 
 src_configure() {
-       local myconf
-       use geoip     || myconf+=" --disable-geoip-database"
-       use dbus      || myconf+=" --disable-qt-dbus"
-       use X         || myconf+=" --disable-gui"
-
-       # econf fails, since this uses qconf
-       ./configure --prefix=/usr --qtdir=/usr \
-               --with-qtsingleapplication=system \
-               --with-libboost-inc=/usr/include/boost \
-               ${myconf} || die "configure failed"
+       # Custom configure script, econf fails
+       local myconf=(
+               ./configure
+               --prefix="${EPREFIX}/usr"
+               --with-libboost-inc="${EPREFIX}/usr/include/boost"
+               --with-qtsingleapplication=system
+               $(use dbus  || echo --disable-qt-dbus)
+               $(use debug && echo --enable-debug)
+               $(use geoip || echo --disable-geoip-database)
+               $(use X     || echo --disable-gui)
+       )
+
+       echo "${myconf[@]}"
+       "${myconf[@]}" || die "configure failed"
        eqmake4
 }



1.7                  net-p2p/qbittorrent/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/metadata.xml?rev=1.7&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/metadata.xml?rev=1.7&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/metadata.xml?r1=1.6&r2=1.7

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml        20 Apr 2014 08:59:31 -0000      1.6
+++ metadata.xml        24 May 2014 22:53:34 -0000      1.7
@@ -5,6 +5,6 @@
   <herd>qt</herd>
   <maintainer>
     <email>[email protected]</email>
-       <name>Markos Chandras</name>
+    <name>Markos Chandras</name>
   </maintainer>
 </pkgmetadata>



1.230                net-p2p/qbittorrent/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/ChangeLog?rev=1.230&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/ChangeLog?rev=1.230&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/ChangeLog?r1=1.229&r2=1.230

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- ChangeLog   7 May 2014 19:38:36 -0000       1.229
+++ ChangeLog   24 May 2014 22:53:34 -0000      1.230
@@ -1,6 +1,17 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.229 
2014/05/07 19:38:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.230 
2014/05/24 22:53:34 pesa Exp $
+
+*qbittorrent-3.1.9.2-r1 (24 May 2014)
+
+  24 May 2014; Davide Pesavento <[email protected]>
+  +qbittorrent-3.1.9.2-r1.ebuild, -qbittorrent-2.9.7.ebuild,
+  -qbittorrent-3.0.11-r1.ebuild, -qbittorrent-3.1.3.ebuild,
+  -qbittorrent-3.1.4.ebuild, -qbittorrent-3.1.5.ebuild,
+  -qbittorrent-3.1.8.ebuild, -qbittorrent-3.1.9.2.ebuild,
+  -qbittorrent-3.1.9.ebuild, metadata.xml, qbittorrent-9999.ebuild:
+  Depend on latest qtsingleapplication in order to fix bug 507998. Several
+  ebuild enhancements. Remove old versions.
 
 *qbittorrent-3.1.9.2 (07 May 2014)
 



1.1                  net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: qbittorrent-3.1.9.2-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild,v 1.1 
2014/05/24 22:53:34 pesa Exp $

EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )

inherit python-r1 qt4-r2

DESCRIPTION="BitTorrent client in C++ and Qt"
HOMEPAGE="http://www.qbittorrent.org/";
MY_P=${P/_}
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"

IUSE="dbus debug geoip +X"

# geoip and python are runtime deps only (see INSTALL file)
CDEPEND="
        dev-libs/boost:=
        dev-qt/qtcore:4
        >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?]
        >=net-libs/rb_libtorrent-0.16.10
        dbus? ( dev-qt/qtdbus:4 )
        X? ( dev-qt/qtgui:4 )
"
DEPEND="${CDEPEND}
        virtual/pkgconfig
"
RDEPEND="${CDEPEND}
        ${PYTHON_DEPS}
        geoip? ( dev-libs/geoip )
"

S=${WORKDIR}/${MY_P}
DOCS=(AUTHORS Changelog README TODO)

src_configure() {
        # Custom configure script, econf fails
        local myconf=(
                ./configure
                --prefix="${EPREFIX}/usr"
                --with-libboost-inc="${EPREFIX}/usr/include/boost"
                --with-qtsingleapplication=system
                $(use dbus  || echo --disable-qt-dbus)
                $(use debug && echo --enable-debug)
                $(use geoip || echo --disable-geoip-database)
                $(use X     || echo --disable-gui)
        )

        echo "${myconf[@]}"
        "${myconf[@]}" || die "configure failed"
        eqmake4
}




Reply via email to