Version bump upstream stable. Bump alpha to new rc. Remove older unstables.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

4 files changed, 25 insertions, 73 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index d9300bf2bc35..bdfd4d5bccd9 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.465 2015/03/08 00:04:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.466 2015/03/20 12:46:12 blueness Exp $
+
+*tor-0.2.5.11 (20 Mar 2015)
+*tor-0.2.6.5_rc (20 Mar 2015)
+
+  20 Mar 2015; Anthony G. Basile <blueness@gentoo.org> +tor-0.2.5.11.ebuild,
+  +tor-0.2.6.5_rc.ebuild, -files/tor.initd-r6, -tor-0.2.4.25.ebuild,
+  -tor-0.2.6.2_alpha-r1.ebuild:
+  Version bump upstream stable.  Bump alpha to new rc.  Remove older unstables.
 
 *tor-0.2.6.3_alpha (08 Mar 2015)
 
diff --git a/net-misc/tor/files/tor.initd-r6 b/net-misc/tor/files/tor.initd-r6
deleted file mode 100644
index 658b77874425..000000000000
--- a/net-misc/tor/files/tor.initd-r6
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r6,v 1.6 2011/12/04 10:31:39 swegener Exp $
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-PIDFILE=/var/run/tor/tor.pid
-CONFFILE=/etc/tor/torrc
-
-depend() {
-        need net
-}
-
-checkconfig() {
-        # first check that it exists
-        if [ ! -f ${CONFFILE} ] ; then
-                eerror "You need to setup ${CONFFILE} first"
-                eerror "Example is in ${CONFFILE}.sample"
-                return 1
-	fi
-
-	# now verify whether the configuration is valid
-	/usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1
-	if [ $? -eq 0 ] ; then
-		einfo "Tor configuration (${CONFFILE}) is valid."
-		return 0
-	else
-		eerror "Tor configuration (${CONFFILE}) not valid."
-		/usr/bin/tor --verify-config -f ${CONFFILE}
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	checkpath -d -m 0755 -o tor:tor /var/run/tor
-        ebegin "Starting Tor"
-        HOME=/var/lib/tor
-	start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Tor"
-	start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
-        eend $?
-}
-
-reload() {
-	if [ ! -f ${PIDFILE} ]; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Reloading Tor configuration"
-	start-stop-daemon --signal HUP --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-misc/tor/tor-0.2.4.25.ebuild b/net-misc/tor/tor-0.2.5.11.ebuild
index a71caa97aa15..a18a26e3c438 100644
--- a/net-misc/tor/tor-0.2.4.25.ebuild
+++ b/net-misc/tor/tor-0.2.5.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.4.25.ebuild,v 1.4 2014/11/02 09:18:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.5.11.ebuild,v 1.1 2015/03/20 12:46:12 blueness Exp $
 
 EAPI="5"
 
-inherit eutils flag-o-matic readme.gentoo versionator toolchain-funcs user
+inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator user
 
 MY_PV="$(replace_version_separator 4 -)"
 MY_PF="${PN}-${MY_PV}"
@@ -16,18 +16,18 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="-bufferevents +ecc nat-pmp selinux stats tor-hardening transparent-proxy threads upnp web"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="-bufferevents +ecc nat-pmp seccomp selinux stats tor-hardening transparent-proxy threads test upnp web"
 
 DEPEND="dev-libs/openssl
 	sys-libs/zlib
 	dev-libs/libevent
 	bufferevents? ( dev-libs/libevent[ssl] )
 	nat-pmp? ( net-libs/libnatpmp )
+	seccomp? ( sys-libs/libseccomp )
 	upnp? ( net-libs/miniupnpc )"
 RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tor )
-"
+	selinux? ( sec-policy/selinux-tor )"
 
 pkg_setup() {
 	enewgroup tor
@@ -43,6 +43,7 @@ src_configure() {
 	# will break tor, but does recommend against -fstrict-aliasing.
 	# We'll filter-flags them here as we encounter them.
 	filter-flags -fstrict-aliasing
+
 	econf \
 		--disable-buf-freelists \
 		--enable-asciidoc \
@@ -51,19 +52,24 @@ src_configure() {
 		$(use_enable bufferevents) \
 		$(use_enable ecc curve25519) \
 		$(use_enable nat-pmp) \
+		$(use_enable seccomp) \
 		$(use_enable tor-hardening gcc-hardening) \
 		$(use_enable tor-hardening linker-hardening) \
 		$(use_enable transparent-proxy transparent) \
 		$(use_enable threads) \
 		$(use_enable upnp) \
-		$(use_enable web tor2web-mode)
+		$(use_enable web tor2web-mode) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage)
 }
 
 src_install() {
 	readme.gentoo_create_doc
 
 	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r6 tor
+	newinitd "${FILESDIR}"/tor.initd-r7 tor
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
 
 	emake DESTDIR="${D}" install
 
diff --git a/net-misc/tor/tor-0.2.6.2_alpha-r1.ebuild b/net-misc/tor/tor-0.2.6.5_rc.ebuild
index cafade20ca0b..458b3b844afc 100644
--- a/net-misc/tor/tor-0.2.6.2_alpha-r1.ebuild
+++ b/net-misc/tor/tor-0.2.6.5_rc.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.2_alpha-r1.ebuild,v 1.3 2015/01/09 20:43:14 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.5_rc.ebuild,v 1.1 2015/03/20 12:46:12 blueness Exp $
 
 EAPI="5"
 
@@ -47,9 +47,7 @@ src_configure() {
 	filter-flags -fstrict-aliasing
 
 	econf \
-		--disable-buf-freelists \
 		--enable-asciidoc \
-		--enable-mempools \
 		--docdir=/usr/share/doc/${PF} \
 		$(use_enable stats instrument-downloads) \
 		$(use_enable bufferevents) \