Replace -O2 with -O3 on x86 systems running GCC 4.1. Closes bug #151221.

Package-Manager: portage-2.1.2_pre3-r3

4 files changed, 76 insertions, 8 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index cdd8279ec244..e6c7febba067 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/rtorrent
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.61 2006/10/05 15:04:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.62 2006/10/19 01:25:33 flameeyes Exp $
+
+*rtorrent-0.6.3-r1 (19 Oct 2006)
+
+  19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +rtorrent-0.6.3-r1.ebuild:
+  Replace -O2 with -O3 on x86 systems running GCC 4.1. Closes bug #151221.
 
 *rtorrent-0.6.3 (05 Oct 2006)
 
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index a4468d450c40..3d88cb7ca6d7 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -17,14 +17,18 @@ EBUILD rtorrent-0.6.1.ebuild 1195 RMD160 ab5b73d6c2f9c410ad5ba4145d85ef0b73ccba4
 MD5 9eaa6e9988bbcbd9989554125a5e6e85 rtorrent-0.6.1.ebuild 1195
 RMD160 ab5b73d6c2f9c410ad5ba4145d85ef0b73ccba45 rtorrent-0.6.1.ebuild 1195
 SHA256 09bd3a8655e57b72d82d20bdcc19846a3adefd51006d190960c52140d4dfcdc2 rtorrent-0.6.1.ebuild 1195
+EBUILD rtorrent-0.6.3-r1.ebuild 1485 RMD160 e7c8f3b0e3360d964dc0e27bc61d4fab88e0a58f SHA1 d16ce8fe0f55b3e67f9c052580048eb0b7f5abd8 SHA256 065c84e95082dc4e5e97f640e4c6fd89e721ca9eec56d9fbca68adc65a72c250
+MD5 4ab9b14f36c7c8394b9d59b3c9f8fa41 rtorrent-0.6.3-r1.ebuild 1485
+RMD160 e7c8f3b0e3360d964dc0e27bc61d4fab88e0a58f rtorrent-0.6.3-r1.ebuild 1485
+SHA256 065c84e95082dc4e5e97f640e4c6fd89e721ca9eec56d9fbca68adc65a72c250 rtorrent-0.6.3-r1.ebuild 1485
 EBUILD rtorrent-0.6.3.ebuild 1195 RMD160 6f01f0f33a63c442f9dd58ff8e06bd2eceeea7f1 SHA1 1dd3296c893904c6a97370a6f1a51a94ac4da60e SHA256 c77d880dfa1b2a6c7b97396bf282c08c62f6ac7a94203ca74430f08fcfd3ed00
 MD5 9c9ebc232adac7a5cfbd56a057c5eaf1 rtorrent-0.6.3.ebuild 1195
 RMD160 6f01f0f33a63c442f9dd58ff8e06bd2eceeea7f1 rtorrent-0.6.3.ebuild 1195
 SHA256 c77d880dfa1b2a6c7b97396bf282c08c62f6ac7a94203ca74430f08fcfd3ed00 rtorrent-0.6.3.ebuild 1195
-MISC ChangeLog 8941 RMD160 38eb8afb99fe39376593913acac0e6204795e6ff SHA1 c84b557d7cacec03fa998c092572e57377203523 SHA256 033b0100a171b1f3630f8e9e1d7317b3fb8bfb3040b08d91af6f6c2fb864ea5e
-MD5 88c1d6913159be7f9f4b026b62c6ccfe ChangeLog 8941
-RMD160 38eb8afb99fe39376593913acac0e6204795e6ff ChangeLog 8941
-SHA256 033b0100a171b1f3630f8e9e1d7317b3fb8bfb3040b08d91af6f6c2fb864ea5e ChangeLog 8941
+MISC ChangeLog 9133 RMD160 f3c56370976dabfa3ae761bf33c0ff819bbfbda0 SHA1 fbd8503d368e0eb40457b98d00a0ece307ba83bc SHA256 e758fe175e1cdea598e25f88d0d45de6817a34bf51ffa7e35e7f21d4512ea2ac
+MD5 837505a97e0bffa97915f631c55daa57 ChangeLog 9133
+RMD160 f3c56370976dabfa3ae761bf33c0ff819bbfbda0 ChangeLog 9133
+SHA256 e758fe175e1cdea598e25f88d0d45de6817a34bf51ffa7e35e7f21d4512ea2ac ChangeLog 9133
 MISC metadata.xml 374 RMD160 3b4c8bbb3bc57b9be1c3f4b4cf16c3a0bd63a081 SHA1 6786d4fcefec4266965354cf474cf7c63367ae7e SHA256 acc036fafdbccd35e5f4099dacaa7f5d50bbce9b18402bd41ecf6447aeb2432e
 MD5 dc4336d6e768b550ef6da8f6c965d234 metadata.xml 374
 RMD160 3b4c8bbb3bc57b9be1c3f4b4cf16c3a0bd63a081 metadata.xml 374
@@ -41,10 +45,13 @@ SHA256 a8f1efac2dd28e4e6c32a334e51212dacf7a13f6ba9658112ab648ad4f4c3a11 files/di
 MD5 f336bf4f7bff55f620c37ccec91d7a66 files/digest-rtorrent-0.6.3 244
 RMD160 b3d5e637e9506c95fc15bb35701a2020636ca9ad files/digest-rtorrent-0.6.3 244
 SHA256 769da79e72d1412207a38fb3f4c8e2b5eceb74a2fe24a7054e3759eb396dec18 files/digest-rtorrent-0.6.3 244
+MD5 f336bf4f7bff55f620c37ccec91d7a66 files/digest-rtorrent-0.6.3-r1 244
+RMD160 b3d5e637e9506c95fc15bb35701a2020636ca9ad files/digest-rtorrent-0.6.3-r1 244
+SHA256 769da79e72d1412207a38fb3f4c8e2b5eceb74a2fe24a7054e3759eb396dec18 files/digest-rtorrent-0.6.3-r1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJR8kAiZjviIA2XgRAn9fAKChFE+IeLfi6DL2eux9++0/AeHq2QCggsBl
-TqSRvGwsXKa8G61qgic9s/o=
-=J5TI
+iD8DBQFFNtQTAiZjviIA2XgRAumNAKDeMSwh2gK1DFJtpppp/uMohDxn5gCfdA0m
+JldFD4r5Gyi7AUe7GMXnQ9Y=
+=IOSY
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/rtorrent/files/digest-rtorrent-0.6.3-r1 b/net-p2p/rtorrent/files/digest-rtorrent-0.6.3-r1
new file mode 100644
index 000000000000..c1dbd3912746
--- /dev/null
+++ b/net-p2p/rtorrent/files/digest-rtorrent-0.6.3-r1
@@ -0,0 +1,3 @@
+MD5 80119c01f484a81626ca89d83bfee885 rtorrent-0.6.3.tar.gz 411337
+RMD160 95c6a7d56d88245a4adf8450261cd82c1923f191 rtorrent-0.6.3.tar.gz 411337
+SHA256 ac9b007213e1a124fee3e4ea77c2f7e94e2e9cc9366702a2ec668ebef8907533 rtorrent-0.6.3.tar.gz 411337
diff --git a/net-p2p/rtorrent/rtorrent-0.6.3-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..c97c92212e96
--- /dev/null
+++ b/net-p2p/rtorrent/rtorrent-0.6.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.6.3-r1.ebuild,v 1.1 2006/10/19 01:25:33 flameeyes Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="BitTorrent Client using libtorrent"
+HOMEPAGE="http://libtorrent.rakshasa.no/"
+SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+RDEPEND=">=net-libs/libtorrent-0.10.1
+	>=dev-libs/libsigc++-2.0
+	>=net-misc/curl-7.12
+	sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	sys-devel/bc"
+
+src_compile() {
+	replace-flags -Os -O2
+
+	if [[ $(tc-arch) = "x86" ]]; then
+		filter-flags -fomit-frame-pointer
+
+		# See bug #151221. It seems only to hit on GCC 4.1 and x86 architecture
+		# it could be safer to fallback to -O1, but with the high use of STL in
+		# rtorrent, that could make it too slow.
+		[[ $(gcc-major-version)$(gcc-minor-version) == "41" ]] && replace-flags -O2 -O3
+	fi
+
+	econf \
+		$(use_enable debug) \
+		--disable-dependency-tracking \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+pkg_postinst() {
+	einfo "rtorrent now supports a configuration file."
+	einfo "A sample configuration file for rtorrent is can be found"
+	einfo "in ${ROOT}usr/share/doc/${PF}/rtorrent.rc.gz."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS README TODO doc/rtorrent.rc
+}