[gentoo-commits] repo/gentoo:master commit in: net-dns/avahi/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     23050364629cb430f9b7c600ff886c6e3a4d8726
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 07:56:00 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 07:56:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23050364

net-dns/avahi: version bump 0.6.32, drop rc.

Package-Manager: portage-2.2.26

 net-dns/avahi/Manifest                                  |  2 +-
 .../{avahi-0.6.32_rc.ebuild => avahi-0.6.32.ebuild}     | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 5e9703b..d6e8b91 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,2 +1,2 @@
 DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f
-DIST avahi-0.6.32_rc.tar.gz 922001 SHA256 e5eb81b1686bb7c7fb02f6b752c508c103f21d170039303fe0796d3282fa2f44 SHA512 2876510aa78b2db0f51383e5f39440cd5dd3a153663862044a6c531ebc67a546e5a5b5fd9c52ab42083300eb39d906511c0c5ab917e6b5979aaba35688e942b6 WHIRLPOOL a612138090770617f82e80be601e76ad0ec9c757a19f1d30de008912044c93976b3b97c0c4946878a32fe44e773648fa64abaecd30d675b48cf75db6dc69244f
+DIST avahi-0.6.32.tar.gz 934004 SHA256 7eb693d878246f0cd05034173fb3ed53447a84dd3b7f01745313cad11071226e SHA512 e6dc788cc8691288ef001007006719b5eb022d484ee6fc84e68a7d227af5993e4d09484b824998155e5b25fc0ffc014beb8961d312982f63b82b10a6e2edee18 WHIRLPOOL e139eca2d1698976a5fca21361c037dd2b1c075654b01674bea3fa22db70067999aba2a61cbfcf69281d5274f5080450e24cf64f9cec1702d142e129fbf03dc7

diff --git a/net-dns/avahi/avahi-0.6.32_rc.ebuild b/net-dns/avahi/avahi-0.6.32.ebuild
similarity index 91%
rename from net-dns/avahi/avahi-0.6.32_rc.ebuild
rename to net-dns/avahi/avahi-0.6.32.ebuild
index dc9cd67..66126722 100644
--- a/net-dns/avahi/avahi-0.6.32_rc.ebuild
+++ b/net-dns/avahi/avahi-0.6.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,14 +9,13 @@ PYTHON_REQ_USE="gdbm"
 
 WANT_AUTOMAKE=1.11
 
-inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env \
-	python-r1 systemd user
+inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env python-r1 systemd user
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://avahi.org/"
-SRC_URI="https://github.com/lathiat/avahi/archive/0.6.32-rc.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-S="${WORKDIR}/avahi-0.6.32-rc"
+S="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -102,18 +101,10 @@ src_prepare() {
 	# https://github.com/lathiat/avahi/issues/24
 	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
 
-	# Fix init scripts for >=openrc-0.9.0, bug #383641
-	# https://github.com/lathiat/avahi/issues/25
-	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
-
 	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
 	# https://github.com/lathiat/avahi/issues/24
 	epatch "${FILESDIR}"/${PN}-0.6.31-fix-install-avahi-discover.patch
 
-	# Allow building client without the daemon
-	# https://github.com/lathiat/avahi/issues/26
-	epatch "${FILESDIR}"/${PN}-0.6.31-build-client-without-daemon.patch
-
 	# Fix build under various locales, bug #501664
 	# https://github.com/lathiat/avahi/issues/27
 	epatch "${FILESDIR}"/${PN}-0.6.31-fix-locale-build.patch