Dropping ancient vidalia version, adding latest release, bringing ebuild up to speed with split qt4 wrt bug 217161.

Package-Manager: portage-2.2_rc7/cvs/Linux 2.6.26-hh1 i686

4 files changed, 46 insertions, 47 deletions

diff --git a/net-misc/vidalia/ChangeLog b/net-misc/vidalia/ChangeLog
index 18db213f92b1..ffb93e194248 100644
--- a/net-misc/vidalia/ChangeLog
+++ b/net-misc/vidalia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/vidalia
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/ChangeLog,v 1.8 2007/08/29 17:21:17 humpback Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/ChangeLog,v 1.9 2008/08/11 23:11:29 yngwin Exp $
+
+*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:
diff --git a/net-misc/vidalia/Manifest b/net-misc/vidalia/Manifest
index 50eb057b5512..492435a7185a 100644
--- a/net-misc/vidalia/Manifest
+++ b/net-misc/vidalia/Manifest
@@ -1,4 +1,4 @@
-DIST vidalia-0.0.13.tar.gz 1833773 RMD160 6bb3f16db07657a23ce882a9916460347b233479 SHA1 e8a8e3eaf2ac590c322a1e8d22c872a497809b58 SHA256 a6d7fe4d23161e6c372454f6fd87d0e56b19c1ce7ea819b1e11acc70030f1fad
-EBUILD vidalia-0.0.13.ebuild 1210 RMD160 05e12a8058c0da971da2e42c8057070292b2d5fd SHA1 f0aaa7d4361f48667c3ad6b91870cd36bf77608f SHA256 8804cf24d0af0af7ac738f806ac76e526428fb7b75bc089599ac9d0ec9d47932
-MISC ChangeLog 1823 RMD160 0e385ca4bc656e68e22a05c000c31dede6b3391d SHA1 ebeda3a691ff9180bd8b62d02c14ed59b49accac SHA256 2199066d0abd4d194740dfa419b966f7c020f01f0d395b1be3e1e02fc8795095
+DIST vidalia-0.1.7.tar.gz 2123747 RMD160 85c77e755c56d56a4d039fb5ea5311d0afce62c6 SHA1 707885bf755e53e6a5269202238c451aaee525a3 SHA256 eaef8698f12ad56991acff04439dcc3bcd1d6087665237a184f2a4e8db4f5d69
+EBUILD vidalia-0.1.7.ebuild 1062 RMD160 ce9d05139a15e34ca6d8efe42e2c9928cf80b711 SHA1 9fddcd2032abfd256b3ee6ed2833af34658dbf84 SHA256 1a6820b074b4d8a37c95e7321053802ca9a2e9e2bd9ee587cbb2b5d7be2a50d8
+MISC ChangeLog 2061 RMD160 020ebfc43d3257f7b82d0a0712552fcde91f3b59 SHA1 fc8ef89760d397f99163746e65c783ad0bf2a0e4 SHA256 5c9793311597cdfe6c6eb16fb45ae65738446a5d90ec10c6d56197859f0f8181
 MISC metadata.xml 225 RMD160 25688ea3e85b38a936ffc49d7b772797b7069bb3 SHA1 d38c6c782f69dc7ce37e56b753fb3415860f1712 SHA256 db199c1fd93a08a36e97ef39645e25d21e471c3b96399a5f460e9acbf1e37fda
diff --git a/net-misc/vidalia/vidalia-0.0.13.ebuild b/net-misc/vidalia/vidalia-0.0.13.ebuild
deleted file mode 100644
index 4f0dbe51075f..000000000000
--- a/net-misc/vidalia/vidalia-0.0.13.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.0.13.ebuild,v 1.1 2007/08/19 16:06:12 humpback Exp $
-
-inherit eutils
-
-DESCRIPTION="Qt 4 front-end for Tor"
-HOMEPAGE="http://www.vidalia-project.net/"
-SRC_URI="http://www.vidalia-project.net/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug"
-
-DEPEND=">=x11-libs/qt-4.1.1"
-RDEPEND="${DEPEND}
-	>=net-misc/tor-0.1.1.20"
-
-pkg_setup() {
-	if use debug && ! built_with_use ">=x11-libs/qt-4.1.1" debug; then
-		eerror "In order to have debug support for Vidalia"
-		eerror "you need to compile Qt 4 with debug support too."
-		die "Qt 4 built without debug support"
-	fi
-}
-
-src_compile() {
-	econf $(use_enable debug) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	ewarn "To have vidalia starting tor, you probably have to copy
-	/etc/tor/torrc.sample to the users \$HOME/.tor/torrc and comment the settings
-	there and change the socks. Also in vidalia change the default user under
-	which tor will run"
-}
diff --git a/net-misc/vidalia/vidalia-0.1.7.ebuild b/net-misc/vidalia/vidalia-0.1.7.ebuild
new file mode 100644
index 000000000000..6936d78c69a5
--- /dev/null
+++ b/net-misc/vidalia/vidalia-0.1.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vidalia/vidalia-0.1.7.ebuild,v 1.1 2008/08/11 23:11:29 yngwin Exp $
+
+EAPI="1"
+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="http://www.vidalia-project.net/"
+SRC_URI="http://www.vidalia-project.net/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 =x11-libs/qt-4.3* )
+	dev-util/cmake"
+RDEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )
+	net-misc/tor"
+
+use debug && QT4_BUILT_WITH_USE_CHECK="debug"
+
+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
+}