Add myself as maintainer, old version cleanup, and version bump

(Portage version: 2.2_rc86/cvs/Linux i686)

5 files changed, 35 insertions, 51 deletions

diff --git a/net-misc/vidalia/ChangeLog b/net-misc/vidalia/ChangeLog
index 20da885882cf..a2f5461297b0 100644
--- a/net-misc/vidalia/ChangeLog
+++ b/net-misc/vidalia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/vidalia
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/ChangeLog,v 1.16 2010/05/22 11:00:09 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/ChangeLog,v 1.17 2010/10/06 02:34:58 chiiph Exp $
+
+*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)
diff --git a/net-misc/vidalia/metadata.xml b/net-misc/vidalia/metadata.xml
index 12982e2d2d39..ed08e4850266 100644
--- a/net-misc/vidalia/metadata.xml
+++ b/net-misc/vidalia/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name='tor'>Allow to use a local tor setup</flag>
-</use>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>chiiph@gentoo.org</email>
+		<name>Tomas Touceda</name>
+	</maintainer>
+	<use>
+		<flag name='tor'>Allow to use a local tor setup</flag>
+	</use>
 </pkgmetadata>
 
diff --git a/net-misc/vidalia/vidalia-0.1.15.ebuild b/net-misc/vidalia/vidalia-0.1.15.ebuild
deleted file mode 100644
index 209b5ad8d9e5..000000000000
--- a/net-misc/vidalia/vidalia-0.1.15.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.1.15.ebuild,v 1.2 2009/10/06 19:06:15 ayoy Exp $
-
-EAPI="2"
-inherit eutils qt4 cmake-utils
-# cmake-utils needs to be last, so we get its src_compile()
-
-DESCRIPTION="Qt 4 front-end for Tor"
-HOMEPAGE="https://www.torproject.org/vidalia/"
-SRC_URI="https://www.torproject.org/vidalia/dist/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 GPL-2 ) openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug"
-
-DEPEND="x11-libs/qt-gui:4[debug?]"
-RDEPEND="${DEPEND}
-	net-misc/tor"
-
-DOCS="CHANGELOG CREDITS README"
-
-pkg_postinst() {
-	echo
-	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."
-	echo
-}
diff --git a/net-misc/vidalia/vidalia-0.2.5.ebuild b/net-misc/vidalia/vidalia-0.2.10.ebuild
index ae675adf1418..63122fbe7bb7 100644
--- a/net-misc/vidalia/vidalia-0.2.5.ebuild
+++ b/net-misc/vidalia/vidalia-0.2.10.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.2.5.ebuild,v 1.1 2009/10/31 14:10:06 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.2.10.ebuild,v 1.1 2010/10/06 02:34:58 chiiph Exp $
 
 EAPI="2"
-inherit eutils qt4 cmake-utils
+
+inherit eutils qt4-r2 cmake-utils
 # cmake-utils needs to be last, so we get its src_compile()
 
 DESCRIPTION="Qt 4 front-end for Tor"
@@ -13,20 +14,25 @@ SRC_URI="https://www.torproject.org/vidalia/dist/${P}.tar.gz"
 LICENSE="|| ( GPL-3 GPL-2 ) openssl"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug"
+IUSE="debug +tor"
 
 DEPEND="x11-libs/qt-gui:4[debug?]"
 RDEPEND="${DEPEND}
-	net-misc/tor"
+	tor? ( net-misc/tor )"
 
 DOCS="CHANGELOG CREDITS README"
 
 pkg_postinst() {
 	echo
-	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."
+	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
 	elog ""
 	elog "You are installing a development release version, to install"
 	elog "upstream stable release use 0.1.x"
diff --git a/net-misc/vidalia/vidalia-0.2.6.ebuild b/net-misc/vidalia/vidalia-0.2.6.ebuild
index 5be3384ec9c2..bedf1d24a87f 100644
--- a/net-misc/vidalia/vidalia-0.2.6.ebuild
+++ b/net-misc/vidalia/vidalia-0.2.6.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.2.6.ebuild,v 1.1 2009/11/20 23:11:17 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.2.6.ebuild,v 1.2 2010/10/06 02:34:58 chiiph Exp $
 
 EAPI="2"
-inherit eutils qt4 cmake-utils
+
+inherit eutils qt4-r2 cmake-utils
 # cmake-utils needs to be last, so we get its src_compile()
 
 DESCRIPTION="Qt 4 front-end for Tor"