diff options
| -rw-r--r-- | net-p2p/btg/ChangeLog | 5 | ||||
| -rw-r--r-- | net-p2p/btg/Manifest | 8 | ||||
| -rw-r--r-- | net-p2p/btg/btg-0.9.7.ebuild | 82 | ||||
| -rw-r--r-- | net-p2p/btg/btg-1.0.0-r1.ebuild | 7 | ||||
| -rw-r--r-- | net-p2p/btg/files/btg-0.9.7-broken_bundled_plotmm_sigc.patch | 100 | ||||
| -rw-r--r-- | net-p2p/btg/files/btg-0.9.7-gcc43.patch | 69 |
6 files changed, 10 insertions, 261 deletions
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 <ssuominen@gentoo.org> btg-1.0.0-r1.ebuild: + amd64 stable wrt #288970, pass -pthread for -Wl,--as-needed. 04 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> btg-0.9.7.ebuild: Replace filtering of -Wl,--as-needed with function from flag-o-matic diff --git a/net-p2p/btg/Manifest b/net-p2p/btg/Manifest index 622da6209ed4..6fd448a360b1 100644 --- a/net-p2p/btg/Manifest +++ b/net-p2p/btg/Manifest @@ -1,13 +1,9 @@ -AUX btg-0.9.7-broken_bundled_plotmm_sigc.patch 4177 RMD160 f2514633c587c0650966ef9cd48996b8f29db1a7 SHA1 f64aa392beefaef9d4c8a004ee03ed4d69e59f05 SHA256 30c73fb4dfc103674a8791d2aa5275ad8d888ddb0dcc71d538d93f824eceb556 -AUX btg-0.9.7-gcc43.patch 2072 RMD160 783d4a59e5db251738c5a0842836b4dc776ceb7b SHA1 67340904363f99b386bc0f1faa0bb9689d6f217f SHA256 4b98e358e49e379ef940057cd1ce0906961d372cefc053136da601f4fb395e70 AUX btg-1.0.0-gcc44.patch 747 RMD160 0bfcbb9805931e0ba50f171913509ad068c4fe4a SHA1 cb0fd87cf7be44f1940c7468362c3d9bba918c05 SHA256 9b04e50a1bb1509cae948727a4fe845af654d46d23446d1ecb414d04ca9dfcb8 AUX btg-1.0.0-gnutls-pc.patch 1869 RMD160 441b3d6f3236fec6b29b43a5ebadaa9c1753bb80 SHA1 7cdebcec7faa2783fe43476d86e3b3aa832170db SHA256 7e06b744f47e098ec96625515e8e06cd0493b949ca86bc0657d955b0f7dd7572 AUX btg-1.0.0-xmlrpc.patch 4073 RMD160 73c3ae34a75a2f2bba0928854e3ab8ad55c92281 SHA1 d124685174d5db7c79fa4fb0457dee5f51a71241 SHA256 fc1de7d3c21a010c270991020886e38401271aae61ac82c1cb5d1fd0a5d61509 AUX btgd-confd 356 RMD160 4a5f537a334ed848d739ef0b80a93b34a4bcd393 SHA1 0b5f812cd19aa0c146a113d1d5baaff14d8ca2b1 SHA256 7feba6c4e38b11c8bafb56dcc7865efd90d88e8f08dd6366ae81c38c78f5f5a8 AUX btgd-init 1015 RMD160 c70fd1f49e83b318ca7e65bc4ca6a1af7a23f4f0 SHA1 ac5aa7b44b31778383f8300e7c07a9559852cabb SHA256 0ce7a6af95c1a9bda8f890b54e3815785c2c213360f2cf383bac1f9423bdc410 -DIST btg-0.9.7.tar.gz 1175042 RMD160 a97d9082f39c8eb8f0e0afe2c678d53584591dec SHA1 5cb01f105e71eb524db8c65bf81b0d1f6a3c4beb SHA256 31237c4b7881b9d3534b476ed986596db4acae0460772eed7364f455da2d89ac DIST btg-1.0.0.tar.gz 1344719 RMD160 c30c6d56ac96d4f3f5d5274b22de0d0676baa749 SHA1 1562c02b563d45d5439cfff6ed680263f4012a64 SHA256 13aa5da13b55e5ebb3b849bf52dbe15f9817247d141a7e6c03979bf1a31ccf1e -EBUILD btg-0.9.7.ebuild 1976 RMD160 59f420045329a34fe93a6c1f5a57153bac8cd81b SHA1 fb3952735902c4656ef94e2cef34a129d3fcd6cf SHA256 70b025cfd5345ba81ea6bb206080d8a25e29288e19bc4a3bf7dad5e0c82fca30 -EBUILD btg-1.0.0-r1.ebuild 2307 RMD160 7453147d79a72d369d6b1092ab33004c6b4fb75c SHA1 a26823c8a7810cd9936d0b44afb328f1c19f7c33 SHA256 28922804f482a3e97de87c21ed485d695c6bf04d460ec815915183eaeef5f95a -MISC ChangeLog 3061 RMD160 999f587bc2731d57a4f3e733f0e6ec1519f6325f SHA1 57fb1e9d2ff33d3413942acda1e5fccdabeed74e SHA256 6e138326f218257e941dd9fb2efc97496e19f9c2bd88146ea14eb12da9f3c43d +EBUILD btg-1.0.0-r1.ebuild 2344 RMD160 aebe2c867bf738c8c110ef49a2fcf4fd2deff940 SHA1 e19a4ad310ae51ea1688cf27237435e4559fafb7 SHA256 58326e59467d438b3464d2f11ce25d7a26946988d097b1fd9d80566c8b2d161d +MISC ChangeLog 3200 RMD160 dae744950b583bb157be1e68c629e2ec57617664 SHA1 7a1eefdd93ae4d36507ea9e59e04e2dd4fd6a49f SHA256 462f23ac2d88b9a25d6cf5fe149edb61851d1cd7d3caefc07a8495562b0f6a0c MISC metadata.xml 476 RMD160 3a9cf5002c0cecdab802a07ae7e0ca53c5ace2cd SHA1 00fec72efb6eea2de49264e06e9bee9f21b0b3fe SHA256 38e3f9016b8bf5d7f4974364f1cc91261a8c8ba886cad5974c1a2f0fbd90f4db 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<void> signal_curve_changed; -+ sigc::signal0<void> 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<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press() -+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press() - { - return canvas_.signal_plot_mouse_press; - } - - //! Return the signal owned by plot canvas --SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release() -+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release() - { - return canvas_.signal_plot_mouse_release; - } - - //! Return the signal owned by plot canvas --SigC::Signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move() -+sigc::signal3<void,int,int,GdkEventMotion*> 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<void,int,int,GdkEventButton*> signal_plot_mouse_press; -- SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release; -- SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move; -+ sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press; -+ sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release; -+ sigc::signal3<void,int,int,GdkEventMotion*> 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<void,int,int,GdkEventButton*> signal_plot_mouse_press(); -- SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release(); -- SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move(); -+ sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press(); -+ sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release(); -+ sigc::signal3<void,int,int,GdkEventMotion*> 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<void,bool> signal_enabled; -+ sigc::signal1<void,bool> 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 <memory> - - 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 <memory> - - 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 <sstream> - #include <iomanip> -+#include <cstring> - - #include <bcore/helpermacro.h> - #include <bcore/os/gnutlsif.h> -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 <fcntl.h> - } - -+#include <cstring> -+ - 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 <unistd.h> - } -+#include <cstring> - 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 <stdarg.h> - #include <fstream> - #include <float.h> -+#include <climits> -+#include <cstdlib> -+#include <cstring> - - #ifdef WIN32 - #include <windows.h> |