From b179b6bb061a6c3941407266b26c05b706a41146 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 27 Oct 2009 11:09:04 +0000 Subject: amd64 stable wrt #288970, pass -pthread for -Wl,--as-needed. (Portage version: 2.2_rc46/cvs/Linux x86_64) --- net-p2p/btg/ChangeLog | 5 +- net-p2p/btg/btg-0.9.7.ebuild | 82 ----------------- net-p2p/btg/btg-1.0.0-r1.ebuild | 7 +- .../btg-0.9.7-broken_bundled_plotmm_sigc.patch | 100 --------------------- net-p2p/btg/files/btg-0.9.7-gcc43.patch | 69 -------------- 5 files changed, 8 insertions(+), 255 deletions(-) delete mode 100644 net-p2p/btg/btg-0.9.7.ebuild delete mode 100644 net-p2p/btg/files/btg-0.9.7-broken_bundled_plotmm_sigc.patch delete mode 100644 net-p2p/btg/files/btg-0.9.7-gcc43.patch (limited to 'net-p2p/btg') diff --git a/net-p2p/btg/ChangeLog b/net-p2p/btg/ChangeLog index a20edbd002eb..3938fc45f248 100644 --- a/net-p2p/btg/ChangeLog +++ b/net-p2p/btg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-p2p/btg # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/ChangeLog,v 1.16 2009/10/04 15:13:45 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/ChangeLog,v 1.17 2009/10/27 11:09:03 ssuominen Exp $ + + 27 Oct 2009; Samuli Suominen btg-1.0.0-r1.ebuild: + amd64 stable wrt #288970, pass -pthread for -Wl,--as-needed. 04 Oct 2009; Samuli Suominen btg-0.9.7.ebuild: Replace filtering of -Wl,--as-needed with function from flag-o-matic diff --git a/net-p2p/btg/btg-0.9.7.ebuild b/net-p2p/btg/btg-0.9.7.ebuild deleted file mode 100644 index ae95d1ffa11c..000000000000 --- a/net-p2p/btg/btg-0.9.7.ebuild +++ /dev/null @@ -1,82 +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/btg/btg-0.9.7.ebuild,v 1.5 2009/10/04 15:13:45 ssuominen Exp $ - -EAPI=1 - -inherit eutils flag-o-matic - -DESCRIPTION="bittorrent client using rb_libtorrent" -HOMEPAGE="http://btg.berlios.de/" -SRC_URI="mirror://berlios/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" -IUSE="debug doc event-callback gtk minimal ncurses session test webinterface" - -RDEPEND=">=dev-libs/boost-1.34.1 - dev-libs/expat - dev-libs/libgcrypt - dev-libs/libgpg-error - dev-libs/libtasn1 - dev-util/dialog - net-libs/gnutls - >=net-libs/rb_libtorrent-0.13_rc1 - gtk? ( dev-cpp/gtkmm:2.4 - dev-libs/libsigc++:2 - x11-libs/pango ) - test? ( dev-util/cppunit ) - webinterface? ( =dev-lang/php-5* virtual/httpd-cgi )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.21 - doc? ( app-doc/doxygen )" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-broken_bundled_plotmm_sigc.patch - epatch "${FILESDIR}"/${P}-gcc43.patch -} - -src_compile() { - append-ldflags $(no-as-needed) - - econf \ - $(use_enable debug) \ - $(use_enable gtk gui) \ - $(use_enable ncurses cli) \ - $(use_enable event-callback) \ - $(use_enable session session-saving) \ - $(use_enable test unittest) \ - $(use_enable webinterface www) \ - $(use_enable !minimal command-list) \ - --enable-btg-config \ - --disable-upnp \ - --disable-dependency-tracking \ - || die - - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS ChangeLog README TODO - - newinitd "${FILESDIR}/btgd-init" ${PN} - newconfd "${FILESDIR}/btgd-confd" ${PN} - - use gtk && make_desktop_entry btgui "BTG GUI Client" btg "Network;P2P" -} - -pkg_postinst() { - enewgroup p2p - enewuser p2p -1 -1 /home/p2p p2p - - echo - elog "BTG needs a daemon.ini and client.ini, to create them run btg-config" - elog "and put them in the home of the user running btg (/home/p2p/.btg by default)" - echo -} diff --git a/net-p2p/btg/btg-1.0.0-r1.ebuild b/net-p2p/btg/btg-1.0.0-r1.ebuild index b655d65f1ac1..89d9dbe90619 100644 --- a/net-p2p/btg/btg-1.0.0-r1.ebuild +++ b/net-p2p/btg/btg-1.0.0-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/btg-1.0.0-r1.ebuild,v 1.1 2009/07/11 15:46:26 volkmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/btg/btg-1.0.0-r1.ebuild,v 1.2 2009/10/27 11:09:03 ssuominen Exp $ EAPI="2" -inherit eutils autotools +inherit eutils autotools flag-o-matic MY_P="${P/_/-}" @@ -13,7 +13,7 @@ SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="curl debug doc event-callback gtk minimal ncurses session test upnp webinterface" RDEPEND=">=dev-libs/boost-1.35 @@ -48,6 +48,7 @@ src_prepare() { } src_configure() { + append-flags -pthread econf LIBS="-lboost_thread -lboost_date_time" \ $(use_enable curl url) \ $(use_enable debug) \ diff --git a/net-p2p/btg/files/btg-0.9.7-broken_bundled_plotmm_sigc.patch b/net-p2p/btg/files/btg-0.9.7-broken_bundled_plotmm_sigc.patch deleted file mode 100644 index 2522484c0e55..000000000000 --- a/net-p2p/btg/files/btg-0.9.7-broken_bundled_plotmm_sigc.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -Naur btg-0.9.7.orig/external/plotmm/compat.h btg-0.9.7/external/plotmm/compat.h ---- btg-0.9.7.orig/external/plotmm/compat.h 2008-03-25 13:49:08.000000000 +0100 -+++ btg-0.9.7/external/plotmm/compat.h 2008-03-25 14:21:18.000000000 +0100 -@@ -59,7 +59,7 @@ - #else - - namespace PlotMM { -- typedef SigC::ObjectBase ObjectBase; -+ typedef sigc::ObjectBase ObjectBase; - } - - #endif -diff -Naur btg-0.9.7.orig/external/plotmm/curve.h btg-0.9.7/external/plotmm/curve.h ---- btg-0.9.7.orig/external/plotmm/curve.h 2008-03-25 13:49:08.000000000 +0100 -+++ btg-0.9.7/external/plotmm/curve.h 2008-03-25 14:21:18.000000000 +0100 -@@ -140,7 +140,7 @@ - int from = 0, int to = -1); - - //! Signals that this curve has changed in some way or the other -- SigC::Signal0 signal_curve_changed; -+ sigc::signal0 signal_curve_changed; - - protected: - virtual void init(const Glib::ustring &title); -diff -Naur btg-0.9.7.orig/external/plotmm/plot.cc btg-0.9.7/external/plotmm/plot.cc ---- btg-0.9.7.orig/external/plotmm/plot.cc 2008-03-25 13:49:08.000000000 +0100 -+++ btg-0.9.7/external/plotmm/plot.cc 2008-03-25 14:21:18.000000000 +0100 -@@ -322,7 +322,7 @@ - connect(sigc::mem_fun(*this,&Plot::on_canvas_expose_event)); - #else - canvas_.signal_expose_event(). -- connect(SigC::slot(*this,&Plot::on_canvas_expose_event)); -+ connect(sigc::slot(*this,&Plot::on_canvas_expose_event)); - #endif - - show_all(); -@@ -406,19 +406,19 @@ - } - - //! Return the signal owned by plot canvas --SigC::Signal3 Plot::signal_plot_mouse_press() -+sigc::signal3 Plot::signal_plot_mouse_press() - { - return canvas_.signal_plot_mouse_press; - } - - //! Return the signal owned by plot canvas --SigC::Signal3 Plot::signal_plot_mouse_release() -+sigc::signal3 Plot::signal_plot_mouse_release() - { - return canvas_.signal_plot_mouse_release; - } - - //! Return the signal owned by plot canvas --SigC::Signal3 Plot::signal_plot_mouse_move() -+sigc::signal3 Plot::signal_plot_mouse_move() - { - return canvas_.signal_plot_mouse_move; - } -diff -Naur btg-0.9.7.orig/external/plotmm/plot.h btg-0.9.7/external/plotmm/plot.h ---- btg-0.9.7.orig/external/plotmm/plot.h 2008-03-25 13:49:08.000000000 +0100 -+++ btg-0.9.7/external/plotmm/plot.h 2008-03-25 14:21:18.000000000 +0100 -@@ -79,9 +79,9 @@ - virtual void clear(); - virtual void end_replot(); - -- SigC::Signal3 signal_plot_mouse_press; -- SigC::Signal3 signal_plot_mouse_release; -- SigC::Signal3 signal_plot_mouse_move; -+ sigc::signal3 signal_plot_mouse_press; -+ sigc::signal3 signal_plot_mouse_release; -+ sigc::signal3 signal_plot_mouse_move; - - protected: - virtual bool on_expose_event(GdkEventExpose* event); -@@ -141,9 +141,9 @@ - Scale *scale(PlotAxisID id) { return tickMark_[id]; } - PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; } - -- SigC::Signal3 signal_plot_mouse_press(); -- SigC::Signal3 signal_plot_mouse_release(); -- SigC::Signal3 signal_plot_mouse_move(); -+ sigc::signal3 signal_plot_mouse_press(); -+ sigc::signal3 signal_plot_mouse_release(); -+ sigc::signal3 signal_plot_mouse_move(); - - void set_selection(const Rectangle &r); - Rectangle get_selection() { return select_; } -diff -Naur btg-0.9.7.orig/external/plotmm/scale.h btg-0.9.7/external/plotmm/scale.h ---- btg-0.9.7.orig/external/plotmm/scale.h 2008-03-25 13:49:08.000000000 +0100 -+++ btg-0.9.7/external/plotmm/scale.h 2008-03-25 14:21:18.000000000 +0100 -@@ -133,7 +133,7 @@ - /*! This signal is thrown whenever the scale is enabled or disabled - * \sa set_enabled, enabled - */ -- SigC::Signal1 signal_enabled; -+ sigc::signal1 signal_enabled; - - protected: - virtual void on_realize(); diff --git a/net-p2p/btg/files/btg-0.9.7-gcc43.patch b/net-p2p/btg/files/btg-0.9.7-gcc43.patch deleted file mode 100644 index af9a03de7603..000000000000 --- a/net-p2p/btg/files/btg-0.9.7-gcc43.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -ur btg-0.9.7.old/UI/gui/errordialog.cpp btg-0.9.7/UI/gui/errordialog.cpp ---- btg-0.9.7.old/UI/gui/errordialog.cpp 2009-01-21 03:46:41.000000000 +0200 -+++ btg-0.9.7/UI/gui/errordialog.cpp 2009-01-21 04:09:44.000000000 +0200 -@@ -21,6 +21,7 @@ - */ - - #include "errordialog.h" -+#include - - namespace btg - { -diff -ur btg-0.9.7.old/UI/gui/questiondialog.cpp btg-0.9.7/UI/gui/questiondialog.cpp ---- btg-0.9.7.old/UI/gui/questiondialog.cpp 2009-01-21 03:46:41.000000000 +0200 -+++ btg-0.9.7/UI/gui/questiondialog.cpp 2009-01-21 04:10:34.000000000 +0200 -@@ -21,6 +21,7 @@ - */ - - #include "questiondialog.h" -+#include - - namespace btg - { -diff -ur btg-0.9.7.old/bcore/auth/hash.cpp btg-0.9.7/bcore/auth/hash.cpp ---- btg-0.9.7.old/bcore/auth/hash.cpp 2009-01-21 03:46:41.000000000 +0200 -+++ btg-0.9.7/bcore/auth/hash.cpp 2009-01-21 04:02:59.000000000 +0200 -@@ -24,6 +24,7 @@ - - #include - #include -+#include - - #include - #include -diff -ur btg-0.9.7.old/bcore/os/socket.cpp btg-0.9.7/bcore/os/socket.cpp ---- btg-0.9.7.old/bcore/os/socket.cpp 2009-01-21 03:46:41.000000000 +0200 -+++ btg-0.9.7/bcore/os/socket.cpp 2009-01-21 03:57:55.000000000 +0200 -@@ -34,6 +34,8 @@ - #include - } - -+#include -+ - namespace btg - { - namespace core -diff -ur btg-0.9.7.old/bcore/os/stdin.cpp btg-0.9.7/bcore/os/stdin.cpp ---- btg-0.9.7.old/bcore/os/stdin.cpp 2009-01-21 03:46:41.000000000 +0200 -+++ btg-0.9.7/bcore/os/stdin.cpp 2009-01-21 03:59:24.000000000 +0200 -@@ -26,6 +26,7 @@ - { - #include - } -+#include - namespace btg - { - namespace core -diff -ur btg-0.9.7.old/external/ini/cdatafile.cpp btg-0.9.7/external/ini/cdatafile.cpp ---- btg-0.9.7.old/external/ini/cdatafile.cpp 2009-01-21 03:46:41.000000000 +0200 -+++ btg-0.9.7/external/ini/cdatafile.cpp 2009-01-21 03:52:21.000000000 +0200 -@@ -42,6 +42,9 @@ - #include - #include - #include -+#include -+#include -+#include - - #ifdef WIN32 - #include -- cgit v1.2.3-65-gdbad