Build vidalia on gcc 4.7. This fixes bug #422645.

5 files changed, 252 insertions, 0 deletions

diff --git a/net-misc/vidalia/ChangeLog b/net-misc/vidalia/ChangeLog
new file mode 100644
index 0000000..e720cd1
--- /dev/null
+++ b/net-misc/vidalia/ChangeLog
@@ -0,0 +1,183 @@
+# ChangeLog for net-misc/vidalia
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/ChangeLog,v 1.35 2012/07/16 17:16:53 blueness Exp $
+
+*vidalia-0.2.20 (16 Jul 2012)
+
+  16 Jul 2012; Anthony G. Basile <blueness@gentoo.org> +vidalia-0.2.20.ebuild:
+  Version bump
+
+  07 Jun 2012; Anthony G. Basile <blueness@gentoo.org> -vidalia-0.2.15.ebuild,
+  -vidalia-0.2.17.ebuild:
+  Remove older version
+
+*vidalia-0.2.19 (07 Jun 2012)
+
+  07 Jun 2012; Anthony G. Basile <blueness@gentoo.org> +vidalia-0.2.19.ebuild:
+  Version bump stable 0.2.x branch
+
+*vidalia-0.2.18 (18 May 2012)
+
+  18 May 2012; Anthony G. Basile <blueness@gentoo.org> +vidalia-0.2.18.ebuild:
+  Version bump
+
+*vidalia-0.3.1 (27 Mar 2012)
+
+  27 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  -vidalia-0.3.0_alpha.ebuild, +vidalia-0.3.1.ebuild:
+  Version bump alpha and remove older. Note: all 0.3.x will be alphas.
+
+  17 Mar 2012; Raúl Porcel <armin76@gentoo.org> vidalia-0.2.12.ebuild,
+  vidalia-0.2.15.ebuild, vidalia-0.2.17.ebuild, vidalia-0.3.0_alpha.ebuild:
+  Drop sparc keywords
+
+  23 Feb 2012; Anthony G. Basile <blueness@gentoo.org> -vidalia-0.2.16.ebuild:
+  Its code base is identical to 0.2.17
+
+*vidalia-0.2.17 (12 Feb 2012)
+*vidalia-0.2.16 (12 Feb 2012)
+
+  12 Feb 2012; Anthony G. Basile <blueness@gentoo.org> +vidalia-0.2.16.ebuild,
+  +vidalia-0.2.17.ebuild:
+  Two version bumps
+
+  01 Feb 2012; Brent Baude <ranger@gentoo.org> vidalia-0.2.12.ebuild:
+  Marking vidalia-0.2.12 ppc for bug 381243
+
+*vidalia-0.3.0_alpha (24 Nov 2011)
+
+  24 Nov 2011; Anthony G. Basile <blueness@gentoo.org> vidalia-0.2.15.ebuild,
+  +vidalia-0.3.0_alpha.ebuild:
+  Added upstream alpha
+
+*vidalia-0.2.15 (24 Nov 2011)
+
+  24 Nov 2011; Anthony G. Basile <blueness@gentoo.org> +vidalia-0.2.15.ebuild:
+  Added latest upstream stable
+
+  24 Nov 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
+  Added myself as maintainer
+
+  24 Nov 2011; Pacho Ramos <pacho@gentoo.org> -vidalia-0.2.10.ebuild,
+  metadata.xml:
+  Drop maintainer due retirement, bug #290906; drop old.
+
+  01 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> vidalia-0.2.12.ebuild:
+  x86 stable wrt bug #381243
+
+  26 Sep 2011; Tony Vroon <chainsaw@gentoo.org> vidalia-0.2.12.ebuild:
+  Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo,
+  Elijah "Armageddon" El Lazkani & Ian "idella4" Delaney in bug #381243.
+
+  08 May 2011; Tomas Touceda <chiiph@gentoo.org> vidalia-0.2.12.ebuild:
+  Update SRC_URI wrt bug 363615
+
+*vidalia-0.2.12 (13 Apr 2011)
+
+  13 Apr 2011; Tomas Touceda <chiiph@gentoo.org> -vidalia-0.2.6.ebuild,
+  +vidalia-0.2.12.ebuild:
+  Version bump and remove old
+
+  06 Oct 2010; Tomas Touceda <chiiph@gentoo.org> vidalia-0.2.6.ebuild,
+  vidalia-0.2.10.ebuild:
+  Remove unneeded elog message wrt bug 339915
+
+*vidalia-0.2.10 (06 Oct 2010)
+
+  06 Oct 2010; Tomas Touceda <chiiph@gentoo.org> -vidalia-0.1.15.ebuild,
+  -vidalia-0.2.5.ebuild, vidalia-0.2.6.ebuild, +vidalia-0.2.10.ebuild,
+  metadata.xml:
+  Add myself as maintainer, old version cleanup, and version bump
+
+  22 May 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
+  Remove humpback from metadata.xml (#34793)
+
+*vidalia-0.2.6 (20 Nov 2009)
+
+  20 Nov 2009; Víctor Ostorga <vostorga@gentoo.org> +vidalia-0.2.6.ebuild:
+  Version bump, adding tor USE flag allowing to use a remote tor
+  installation, bug #245915
+
+*vidalia-0.2.5 (31 Oct 2009)
+
+  31 Oct 2009; Víctor Ostorga <vostorga@gentoo.org> -vidalia-0.1.7.ebuild,
+  -vidalia-0.1.12.ebuild, +vidalia-0.2.5.ebuild:
+  Cleaning out old versions, adding upstream development release, bug
+  #276483
+
+  28 Oct 2009; Torsten Veller <tove@gentoo.org> metadata.xml:
+  humpback is AWOL (#34793). Adding maintainer-needed
+
+  06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> vidalia-0.1.7.ebuild,
+  vidalia-0.1.12.ebuild, vidalia-0.1.15.ebuild:
+  Removed alternative dependency on Qt metapackage, moved to EAPI=2, removed
+  QT4_BUILD_WITH_USE_CHECK and dependency upon cmake (pulled in
+  automatically by cmake-utils eclass)
+
+*vidalia-0.1.15 (06 Oct 2009)
+
+  06 Oct 2009; Patrick Lauer <patrick@gentoo.org> +vidalia-0.1.15.ebuild:
+  Bump to 0.1.15, fix homepage and src_uri
+
+*vidalia-0.1.12 (25 Apr 2009)
+
+  25 Apr 2009; Patrick Lauer <patrick@gentoo.org> +vidalia-0.1.12.ebuild:
+  Bump to 0.1.12, fixes #236974
+
+*vidalia-0.1.7 (11 Aug 2008)
+
+  11 Aug 2008; Ben de Groot <yngwin@gentoo.org> -vidalia-0.0.13.ebuild,
+  +vidalia-0.1.7.ebuild:
+  Dropping ancient version, adding latest release, bringing ebuild up to
+  speed with split qt4 wrt bug 217161.
+
+  29 Aug 2007; Gustavo Felisberto <humpback@gentoo.org>
+  -vidalia-0.0.12.ebuild:
+  Removed version because of broken deps (needs old tor). Credit goes to Mr
+  Bones :)
+
+*vidalia-0.0.13 (19 Aug 2007)
+
+  19 Aug 2007; Gustavo Felisberto <humpback@gentoo.org>
+  vidalia-0.0.12.ebuild, +vidalia-0.0.13.ebuild:
+  Fixed dependencies on 0.0.12 and bumped to 0.0.13.
+
+*vidalia-0.0.12 (17 Jun 2007)
+
+  17 Jun 2007; <humpback@gentoo.org> -vidalia-0.0.7.ebuild,
+  -vidalia-0.0.8.ebuild, -vidalia-0.0.10.ebuild, +vidalia-0.0.12.ebuild:
+  Removed obsolete versions and added 0.0.12. This closes bug #174630. Thanks
+  to those that helped there.
+
+*vidalia-0.0.10 (16 Jan 2007)
+
+  16 Jan 2007; Gustavo Felisberto <humpback@gentoo.org>;
+  vidalia-0.0.8.ebuild, +vidalia-0.0.10.ebuild:
+  Bump
+
+  12 Oct 2006; Jason Wever <weeve@gentoo.org> vidalia-0.0.8.ebuild:
+  Added ~sparc keyword.
+
+*vidalia-0.0.8 (11 Oct 2006)
+
+  11 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  vidalia-0.0.7.ebuild, +vidalia-0.0.8.ebuild:
+  Bumped to 0.0.8 . This will probably be updated do to diferent ways that it
+  can start Tor
+
+  19 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  vidalia-0.0.7.ebuild:
+  Added ~ppc, bug #143929
+
+*vidalia-0.0.7 (08 Jul 2006)
+
+  08 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>; +metadata.xml,
+  +vidalia-0.0.7.ebuild:
+  Initial import from sunrise overlay. Thanks to everyone in bug #138893
+
+  08 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>; ChangeLog:
+  Added 0.0.7 and ~amd64
+
+  02 Jul 2006; Santiago M. Mola <cooldwind@gmail.com> ChangeLog:
+  Initial ebuild (vidalia-0.0.6) for bug #138893
+
diff --git a/net-misc/vidalia/Manifest b/net-misc/vidalia/Manifest
new file mode 100644
index 0000000..c7832a6
--- /dev/null
+++ b/net-misc/vidalia/Manifest
@@ -0,0 +1,5 @@
+AUX vidalia-0.3.1-gcc-4.7.patch 441 SHA256 f83c6cc85d75b4953315abba74394677037dc66d62411a3e570d1c0999945072 SHA512 db8bf3b3dd9c760cfbd054d5a1b3c73375600608a8c597aad5d6924b620bf64adb73e5e308662992f0c9d70d7b2b3e5c5e35d70dad019262fcd9785ffd268ab3 WHIRLPOOL a1897ac9156f57ba1d8886a749975b61d5b794e61287c9d4e60c32422adcc84a982a8c8c26be4ece0f376afcd0e0fbb0d3a3d04d8446d8f236224af7110392d2
+DIST vidalia-0.3.1.tar.gz 6016265 SHA256 1523d31ea6a3eaa11d4665eccfcb2dc755a4c6945d9e2d311032a300a9e583d7 SHA512 afc2a7e0871857797c360dc478ead4ccb26a9378a8c6b0e612e0b613826af95e0a18fdbb184155986f82e6ee740ba0795c6757552f0253e09807c79e6ae1dda6 WHIRLPOOL d61232c82f86cbfa0dba219e2874f74665b4982a65a43b4d8e0753b887df7cdfc37405364e3db872213e6f8acff351edd4c4bb224d771acefa8de7b21c80066a
+EBUILD vidalia-0.3.1-r1.ebuild 1197 SHA256 e3b45ba0a8e5750cd8159009d094df04841702dbea5a44c1f4843d45006d73c7 SHA512 63e404e7eed55a0a06b576f5c7983c4c03a056e5bd58cce4c57d7e5e997312f25a3ddbc8600fd59c2615eb22615eb1cd5527f485e0ba3a05e125d003ee24aa3d WHIRLPOOL 6e9860eab94d5ae5faceff461fa725f420157fe4ec18db409a05b8c83e23fb2d8215968aa82bf402d429cc40deddfae91e5b595ae1f3fb51c28263559b27fda8
+MISC ChangeLog 6189 SHA256 b2fd4394ae217519bd16b44c161b6d6a29f8cc50c2c4bcc78c048d91d159cb04 SHA512 0205421277271842827b7bac434f8d41625cf3641769e26e8985937d12da584f40cfa954a8717ee53ce5f99571d9dc26f55f2eb0e6286c0d989bb76c8bf7e9d8 WHIRLPOOL 76ffb516d6da93b6fdbe99f436d275ca52086ddbd0a88bf2574ae116c74c21b5f6d667044eae637eed04915e6c476416a7b3f062ec773cbf9a620744076de1d1
+MISC metadata.xml 310 SHA256 d638bb2504793dc5700b2993b1ae6064087dda3d0e415cad94d73a28da87a6fb SHA512 0263f428be9bc2fc31c60670738cc2afe614ca9f7a4353fd8b05614892cd10f778ff0a15775c6ae0982988f28cb84d9186b69e887b70558000ae4db2150b86f9 WHIRLPOOL da963e27f96340fec7f10ccf30e001364bfd5810e7e635ad85b97527343a7a9f4f5e44ee10a2b58b334862701f9701a1cd8e76364eb5783f8ff2f608f76138f3
diff --git a/net-misc/vidalia/files/vidalia-0.3.1-gcc-4.7.patch b/net-misc/vidalia/files/vidalia-0.3.1-gcc-4.7.patch
new file mode 100644
index 0000000..4c163af
--- /dev/null
+++ b/net-misc/vidalia/files/vidalia-0.3.1-gcc-4.7.patch
@@ -0,0 +1,12 @@
+diff -ru vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp
+--- vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp	2012-08-08 18:02:01.901732270 +0200
++++ vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp	2012-08-08 18:03:26.241677875 +0200
+@@ -20,6 +20,8 @@
+ 
+ #include "Vidalia.h"
+ 
++#include <unistd.h>
++
+ PluginEngine::PluginEngine(QObject *parent)
+   : QScriptEngine(parent)
+ {
diff --git a/net-misc/vidalia/metadata.xml b/net-misc/vidalia/metadata.xml
new file mode 100644
index 0000000..fdcaad6
--- /dev/null
+++ b/net-misc/vidalia/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<use>
+		<flag name='tor'>Allow to use a local tor setup</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/vidalia/vidalia-0.3.1-r1.ebuild b/net-misc/vidalia/vidalia-0.3.1-r1.ebuild
new file mode 100644
index 0000000..b48cc84
--- /dev/null
+++ b/net-misc/vidalia/vidalia-0.3.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.3.1.ebuild,v 1.1 2012/03/27 15:28:42 blueness Exp $
+
+EAPI="4"
+
+# cmake-utils needs to be last, so we get its src_compile()
+inherit eutils qt4-r2 cmake-utils
+
+DESCRIPTION="Qt 4 front-end for Tor"
+HOMEPAGE="https://www.torproject.org/projects/vidalia.html.en"
+SRC_URI="https://www.torproject.org/dist/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 GPL-2 ) openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug +tor"
+
+DEPEND="x11-libs/qt-gui:4[debug?]"
+RDEPEND="${DEPEND}
+	tor? ( net-misc/tor )"
+
+DOCS="CHANGELOG CREDITS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.3.1-gcc-4.7.patch
+}
+
+pkg_postinst() {
+	ewarn
+	if use tor; then
+		ewarn "To have vidalia starting tor, you probably have to copy"
+		ewarn "/etc/tor/torrc.sample to the users ~/.tor/torrc and comment"
+		ewarn "the settings there and change the socks. Also, in vidalia"
+		ewarn "change the default user under which tor will run."
+	else
+		ewarn "You have disabled tor USE flag, which means you need to "
+		ewarn "configure tor on a different host."
+	fi
+	ewarn
+}