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

Package-Manager: portage-2.2_rc86/cvs/Linux i686

6 files changed, 40 insertions, 68 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/Manifest b/net-misc/vidalia/Manifest
index 7152b3092be6..9ed4b437e927 100644
--- a/net-misc/vidalia/Manifest
+++ b/net-misc/vidalia/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST vidalia-0.1.15.tar.gz 2231232 RMD160 82ea9736176128b6fbffde8b3bac7bfbce41f8eb SHA1 36d81c063f001db4509a4ad5e3eab1fb849f0562 SHA256 fe3f8c82fe43f75fa062aa8f2f687b74be8fd51267b1a3dcc159f4b4c496a3b4
-DIST vidalia-0.2.5.tar.gz 2689970 RMD160 8567609324786bc8029de4d11d1a680d6443246c SHA1 6f62b7905ed59702fe9ee2c2fc9ff598f211a841 SHA256 84b9a4f01c6c1ced3ccbfddcb36638f91ffe5c43ff08a1d6660fe31d43c714d5
+DIST vidalia-0.2.10.tar.gz 5566130 RMD160 7332f2c402f16a1c1c4fa8c0a04900f323eb8bc5 SHA1 a70b4ceece9b54e15d7f4929a4d790e9c61c55df SHA256 7897443974c81f4d354abc5bed1fd3f2d2989fb7c5c0eacde57719d469fdc4b5
 DIST vidalia-0.2.6.tar.gz 2692028 RMD160 3ea1afa38994e36d8758a41111eed82a21992e2e SHA1 25ea8d2a249b09b31e5a5120a0f410be446e297f SHA256 ec178d13ccc04809562c999ae37cdfea85a4aae9b8669b6bdb9faf1b7986f14a
-EBUILD vidalia-0.1.15.ebuild 956 RMD160 f0d6709c2a2b983fd8a3b222a44c129ec8d4af35 SHA1 aee8a01808dc10907ee94ee18ecfbecc22b5029d SHA256 c45c9b63359d5a72059f70efee23131478c69ce36f25cb0e0da97fa24a2e5088
-EBUILD vidalia-0.2.5.ebuild 1116 RMD160 d14128657d5d7b647e8528a71df2e63f22cee549 SHA1 cc6ad14855ecc256c930948b7fbcd11aedaef547 SHA256 fe03c8b2ca9827178f366151ba45006a66e4cfb53ef3df15a90f31cce2c75872
-EBUILD vidalia-0.2.6.ebuild 1283 RMD160 6e02de0c3d3699c6fa0860336a607a0a49aae951 SHA1 dad6c8d8e7bdf9b97636c0333ab87324409298b8 SHA256 c42fbaeb90aada7459970900a33b21893813c6143aa86333359f0d102e1e5ce1
-MISC ChangeLog 3308 RMD160 436165d347eaa19a05ac97082986d7d55729918e SHA1 89702f24d425ad178131d01857128a7899d17094 SHA256 9e22697102086958f3f9f2483b286fb85725fca5c2aecfcc8ff0a0ad48816e23
-MISC metadata.xml 303 RMD160 b6986c542b657e2d866ecec2533025d41fe5255a SHA1 35dee865e6265fae5f7658f648b2a1f4554014b7 SHA256 81b67cc33ec44907dc3e08801adbc5f9278431ccdcd81f5d61c0f0179e61c88e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkv3uT4ACgkQV3J2n04Eauw81wCdFJP+ldy/pgz9aFZ0yFzdZSYz
-bp0AnREQkEsRPAXGlQ7VAmyfemruDieX
-=eCaE
------END PGP SIGNATURE-----
+EBUILD vidalia-0.2.10.ebuild 1286 RMD160 ff178c8a34d805850e27e7dff9859439f73694b7 SHA1 7658806bca1bd145fbdcca49034de94a697c8349 SHA256 ed54583eff97fcf07ba50397ab40f87b5bc295e625e9a0d8cac49df07a67b3f0
+EBUILD vidalia-0.2.6.ebuild 1285 RMD160 79bde5e47ea828b183f948843297f36b8f35dbf2 SHA1 49793ee5a16ea2387cb06e7d846f4998e539a35e SHA256 3c7df4dc70a363bd7a1be472cf806ebe6f066cf6c2f5b18d4380d010d8e6fc71
+MISC ChangeLog 3568 RMD160 725724fe6ddb97a41d7827ae3ed12a354551a7ed SHA1 e1f46207923837dc356a734620b08b676df59d87 SHA256 a59e80f0758d20489a1d7ce27cc66a3862e8ed034ece91d6e84acc7a88c63689
+MISC metadata.xml 327 RMD160 ae17b487cf3077270f3ef8f59465758081ae1d78 SHA1 0e0535d58f4f344acbcfe88256e958a64347d23c SHA256 d118d2bee04b5659a8185a7a3108f30d3d4b0c20b1b66996eb7974aa26c979b5
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"