net-misc/fatrat: Migrate to EAPI 5. Add patches from Debian to fix underlinking and build with GCC 4.7.

5 files changed, 86 insertions, 4 deletions

diff --git a/net-misc/fatrat/ChangeLog b/net-misc/fatrat/ChangeLog
index 004a6dbb8..9ef3e0192 100644
--- a/net-misc/fatrat/ChangeLog
+++ b/net-misc/fatrat/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jun 2013; Michael Palimaka <kensington@gentoo.org> fatrat-1.1.3.ebuild,
+  +files/fatrat-1.1.3-gcc-4.7.patch, +files/fatrat-1.1.3-gold.patch:
+  Migrate to EAPI 5. Add patches from Debian to fix underlinking and build with
+  GCC 4.7.
+
   08 Mar 2013; Patrick Lauer <patrick@gentoo.org> fatrat-1.1.3.ebuild:
   Fix qt deps
 
diff --git a/net-misc/fatrat/Manifest b/net-misc/fatrat/Manifest
index deb1ce7b9..a9a0f0ae5 100644
--- a/net-misc/fatrat/Manifest
+++ b/net-misc/fatrat/Manifest
@@ -1,4 +1,6 @@
-DIST fatrat-1.1.3.tar.gz 1105224 SHA256 ad3ea5e35a9c146838e549ff0ca5d341a332793c02008255ee7849d0e1a5cad0
-EBUILD fatrat-1.1.3.ebuild 1343 SHA256 ae278b5c20f6b0a53640abb69593026f03382356d8bd074432a35d017868abee SHA512 34a7eac097e09dff828d73c44b37c09bb88b9c8d86c8ca5da6751cf6ef66a1759a70b495a5b7663c691847013030926fc4f220c9f0c88c6ac719d2de8f7718b7 WHIRLPOOL 5714457f773ae6f82d063f5c3fdd973e9599312049b2784495d02520ec1c2015b731874d6f11a2a219d2dba91dd53fd11a4395489c9518c641377f40688569c4
-MISC ChangeLog 359 SHA256 13f192b49a6bd5752c59e3139bbecda65b219016c297687d0a102750b4597934 SHA512 7ccc1d2cf6a2dafca3cde7e18d56326d6f4aa8375414c1080ce2cb68012be613b7c9841da03eac7c5676346f048aefba649059da79a1cd223dec6cbaa90d4a62 WHIRLPOOL abb5312da3b2beb8d44fbca6d470f203e7d4637ae3e5f5f3d338f91aee63e7a7e79dd1e15332c2e7a061cf4643f4e1d9ed3e4fcedd033f3078cf24d82fafadde
+AUX fatrat-1.1.3-gcc-4.7.patch 1179 SHA256 acb7440ca5628726ef3baf64b923b91710aa4963047d75376a24d5a1d0dad570 SHA512 5bbb9ba690ffe43835618b76c1710898adddf1eddc4798fc84c3c5e1a8c1e73a0c6dd3ccae5247efcf8b3504a5785e2fbd8f3362e7ad23d9277a113b0244e80b WHIRLPOOL 2c3bb8e8126efd4a47661deb73a5cd7cb303f47306cc13a49f45dca36aaf6a06209a7a617d20a7ba96a7b4114bd633f7fa38c34f07626e6b6a0ea30f0fbb9e63
+AUX fatrat-1.1.3-gold.patch 1060 SHA256 e30386bd5651c220203c73ee356e8ec976b4c802149b0516bd48a81d81b90399 SHA512 d1f755ff47b4566df3950ac59d2a24657c4f9a238bebb03cf6962634eb06cfdb698dd83e29be2d545c3494fd366d2ef927cf8f29ac61691198d31548ef976305 WHIRLPOOL 04d8e102f3d76ad4d6fdd7d391f3d641b666b6c7c391b76bf9788e2f24a7256866fff63c7073feb8ae1d7eef9c0614023e0cdb3aa467c97f0c18293692dc4a1d
+DIST fatrat-1.1.3.tar.gz 1105224 SHA256 ad3ea5e35a9c146838e549ff0ca5d341a332793c02008255ee7849d0e1a5cad0 SHA512 17628eb4c5b1b5d3f192e010e14ec27e1e1ec01735baeccb4b3b0f40a3de856534b615ec1296fce16a08406da55000b6af26a711d2bfdf667fbf6cffdc77c764 WHIRLPOOL f538d891cee15847f99a24e3b1f6ac5653720d783fc77183d782f14748ddeec2c8167452ea9f556f8d937226be30e0a591fe20980120eca72472f6a77d16feb1
+EBUILD fatrat-1.1.3.ebuild 1421 SHA256 ff7fab0551597dc821b110855a8c71577c70a6225afd222634a60d86b018ffac SHA512 7f09015d70f42e6c8e38027423074967845a44d140ca0add9909e446503617fbc91c75a68dfd8f509d605dcd2a3a44b78ed7974ee8ae725877ff005739a84d98 WHIRLPOOL d71aa2fd887f909197c7bfac97981cfcaf520d2dc03ee3904a1d48db14570ba81313b2546e37df329a90ee1dd732413b2a44c7995a0d9d6df06d01b15998315d
+MISC ChangeLog 597 SHA256 e40d633e93a21ab2f69c6548a98a2a4e19000f8b866f6c89baf809b8bb1aa3b6 SHA512 9dc36cdd1318e62a2d8196c7e3ebf951e21b4a562c8fde8bfbd18bf4d6088985bf4035a6cd9a99d2b81bd70664b0717bd8ae7c917b622f7f1ffdee8751aac755 WHIRLPOOL 644445352d298b65b046ecbf1389ddccf48168a5f4ea733e63a42407b4893ef88d5b724f36a39dabee49d338284f521cbe10daf9a5b35c87011364dad34d2c55
 MISC metadata.xml 372 SHA256 dd01ea35ef8fe2dde916954d4078a6c3580f35656a3f584986086c2130a8350f SHA512 270793b3836cd961760fb8a72920f1ff6c9e0fa32d3a83876450a9769cdb8d8859bb737bb620b47c9a456bf710598f2149145da718df0b323f330a12e7ce4d6c WHIRLPOOL dbcec2807027c4050da8262a655e501e340e8c8e139d20a9a2b083200fc94fc2d2534a075e0f6566d87eddd984ca81f5a52fb91c5c5f76238b93a5421ccb909a
diff --git a/net-misc/fatrat/fatrat-1.1.3.ebuild b/net-misc/fatrat/fatrat-1.1.3.ebuild
index 1d44d6251..e9ea1a90b 100644
--- a/net-misc/fatrat/fatrat-1.1.3.ebuild
+++ b/net-misc/fatrat/fatrat-1.1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="5"
 
 inherit cmake-utils
 
@@ -27,6 +27,11 @@ RDEPEND="dev-qt/qtgui:4[dbus]
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-4.7.patch"
+	"${FILESDIR}/${P}-gold.patch"
+)
+
 src_configure() {
 		local mycmakeargs="
 			$(cmake-utils_use_with bittorrent) \
diff --git a/net-misc/fatrat/files/fatrat-1.1.3-gcc-4.7.patch b/net-misc/fatrat/files/fatrat-1.1.3-gcc-4.7.patch
new file mode 100644
index 000000000..06e9521fb
--- /dev/null
+++ b/net-misc/fatrat/files/fatrat-1.1.3-gcc-4.7.patch
@@ -0,0 +1,45 @@
+Description: Fix build with gcc 4.7, add missing includes.
+Origin: vendor
+Forwarded: not-needed
+Author: Sebastian Ramacher <s.ramacher@gmx.at>, Steven Chamberlain <steven@pyro.eu.org>
+
+--- a/src/engines/CurlDownload.cpp
++++ b/src/engines/CurlDownload.cpp
+@@ -45,6 +45,7 @@
+ #include <QtDebug>
+ #include <iostream>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ CurlDownload::CurlDownload()
+ 	: m_curl(0), m_nTotal(0), m_nStart(0), m_bAutoName(false), m_nUrl(0), m_file(0)
+--- a/src/poller/EpollPoller.cpp
++++ b/src/poller/EpollPoller.cpp
+@@ -30,6 +30,7 @@
+ #include <sys/epoll.h>
+ #include <errno.h>
+ #include <alloca.h>
++#include <unistd.h>
+ 
+ EpollPoller::EpollPoller(QObject* parent)
+ 	: Poller(parent)
+--- a/src/engines/RapidshareFreeDownload.cpp
++++ b/src/engines/RapidshareFreeDownload.cpp
+@@ -36,6 +36,7 @@
+ #include <QApplication>
+ #include <QMessageBox>
+ #include <QMutex>
++#include <unistd.h>
+ 
+ static QMutex m_mInstanceActive;
+ 
+--- a/src/poller/KqueuePoller.cpp
++++ b/src/poller/KqueuePoller.cpp
+@@ -31,6 +31,7 @@
+ #include <sys/event.h>
+ #include <sys/time.h>
+ #include <alloca.h>
++#include <unistd.h>
+ 
+ KqueuePoller::KqueuePoller(QObject* parent)
+ 	: Poller(parent)
diff --git a/net-misc/fatrat/files/fatrat-1.1.3-gold.patch b/net-misc/fatrat/files/fatrat-1.1.3-gold.patch
new file mode 100644
index 000000000..ef9e155c6
--- /dev/null
+++ b/net-misc/fatrat/files/fatrat-1.1.3-gold.patch
@@ -0,0 +1,25 @@
+Description: explicitly link against the following libraries to avoid FTBFS
+with gold linker or ld --no-add-needed: pthread, dl, boost.system and
+boost.filesystem.
+Author: Cristian Greco <cristian@regolo.cc>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,7 +43,7 @@
+ 	
+ 	SET(Boost_USE_MULTITHREAD ON)
+ 	SET(Boost_USE_STATIC_LIBS OFF)
+-	find_package(Boost COMPONENTS date_time REQUIRED)
++	find_package(Boost COMPONENTS date_time system filesystem REQUIRED)
+ 	
+ 	if(Boost_FOUND)
+ 		message(STATUS "boost-datetime found OK")
+@@ -427,7 +427,7 @@
+ add_executable(fatrat ${fatrat_SRCS} ${fatrat_MOC_SRCS} ${fatrat_UIS_H}
+ ${fatrat_QRC_H} ${lrelease_outputs})
+ 
+-target_link_libraries(fatrat ${QT_LIBRARIES} ${libtorrent_LDFLAGS} ${gloox_LDFLAGS} ${curl_LDFLAGS} ${Boost_LIBRARIES} ${QT_ADDITIONAL_LIBS} -export-dynamic)
++target_link_libraries(fatrat ${QT_LIBRARIES} ${libtorrent_LDFLAGS} ${gloox_LDFLAGS} ${curl_LDFLAGS} ${Boost_LIBRARIES} ${QT_ADDITIONAL_LIBS} -lpthread -ldl -export-dynamic)
+ 
+ set(fatrat_DEV_HEADERS
+ 	${CMAKE_CURRENT_SOURCE_DIR}/src/fatrat.h