net-dns/avahi: switch to python-r1

Package-Manager: portage-2.1.11.62
Manifest-Sign-Key: 0xF52D4BBA

2 files changed, 23 insertions, 27 deletions

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 1926f12..cd3968e 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -10,23 +10,23 @@ AUX avahi-0.6.31-host-name-from-machine-id.patch 3001 SHA256 257685dde4c7dc78b9f
 AUX avahi-0.6.31-install-exec-hook.patch 507 SHA256 5411262dd719e647ab7781d2e10ff05d051ff1d7218d58e5bf3a3fbe8628a439 SHA512 c25802f78b5c2f6cc15705c6e426b6590dbcdf30d33e239bd919e9592c5e72c7fb244726e74addfeff4b81fa41cc62afb3ddb880232fea66f3cc9470bb5940b1 WHIRLPOOL 864804ca378b2ef83766ba10e08998f0524ed8c2f6c5fe491eefe88dac2184a3b20848258cd7d19af10a50bbbe8567928c3762b00896bb32b18fda6a4d117c19
 AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 SHA256 0bd4f2b2f720684b754698d86b6b1f106576473cead815e7b60b1c62171e4cdc SHA512 c2d11b243acdc058cde03b872dccbbbd44a7a584adf168f16016f29c7a5d9d8668095b781f53102feba8b9c80b2cbbd788c9b327d9d1e2e552fbdcf3c2960517 WHIRLPOOL faae601dca07f267ebe6f8254ff2e00d7ff3de3aa4aa92186e9dead9ac49b43c670b3310d0d7671eae8858ef2f046a4c6b27cb1bb23c20413fddb791ad793a67
 DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f
-EBUILD avahi-0.6.31-r99.ebuild 6084 SHA256 6852b254dff5afb80cc875a524b4b38624d594d8422d7b9fa026b87c0501c665 SHA512 6f5b5caf197b5b08289e1e5b342748f9ef4e0da4331b6b181aa9eee30aaa352dc6f0a3912ab24de70a3122fa430c7a3b50aa207e574b410c8cec08d2b4b13963 WHIRLPOOL d8a04e9e5702c9a0e27d1b4f444a42585589ddb333c0a2f1d2aa9af70111c33bd11bdb9ff93ed33b458b2a759e9ffe873b7d1b5ee36c3738e05210cde12d09c9
+EBUILD avahi-0.6.31-r99.ebuild 5897 SHA256 73c8d72a11f62448d86172543776b3deaff4c50a79a2c4cc9699adc3adb7667f SHA512 e68f5c36bd81c41f7eaaeb3eb3272ec545a99fab7955ca913a05c9f9f319b6b4f28c1f23fa8d3adf86a0ffe1d2d03c92f80417dcd95bde72162c07fce0e55d2a WHIRLPOOL 70d1f64633a4885be81a335649fbfa0f6c6b506f171eca2a97c249454a897ac4e450eead106289ae9c7007c4a641da4bf74584582a8bcd7ba8e94509eda06c1c
 MISC ChangeLog 35925 SHA256 007cb0fe777f7f3c5fa7b17e70a5a189925a9fc963a5f02c8a4d6636163a439b SHA512 39e4f1f6c6b13029e2e34684ed14d44bd775885f44b8f21bcee3e0ea8adedb0d1b1e9676e7754c1ed8d231ab20f0cc59a995e6e6f3ec7eb6eb5811aba38a7723 WHIRLPOOL 0ef0cd907cc46ca021c436b26c4257916cc36ea3d874d65d349ab9cab4769af1b3dc299084a0d3fd2efd82e1ceff254b1d1597549bbb2e8117ab9df53dc3fe62
 MISC metadata.xml 924 SHA256 f35a98d122e0ea6a5e9a491cd9327fc4fc0a752b4f5bb6bcf746c914eb0c42bb SHA512 c386ad5a44a2dc6bc8d9d62ed27381550ec9d62fa685f2cdc7857c7bbcc31baa00ec4481d3b2694eab32cb899314dd20603c917479b6deac132a5204cdae3d5a WHIRLPOOL e2893a1fc00d6649000904a8db99f50efabf8b1aecdab2fa0eec401204b593aeadf8eb13812c1ada324315a7f0d9b617a9b1c3174e7f7d07f2c94374c7034276
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRoTs9AAoJEJOE+m71LUu6oRcP/1wWrfviICFc8ohLkG/x5Sbw
-mbGLeS0vVmEohJeiScUlZEUQJJ4V88QqJ/FpLR1h2/zPiL8RKKED7RqpPqXUW6eR
-pFNWSZ15Vbu6oxT78G4CpIqMXzrpOUU9FfhKpmI19F1n80QiBA8MZ0QOdG4pLw4x
-uL2EhZioNkt7bBvAL+FERgcmCDMtBPS9CHS6J7Q04qJuKgt3NUSegCBsceLbbjWb
-RmFRByjy139xER/jb6g+SIGHcWCygUHdcyI4fM1FUrbicygAGimAD4RoKDwRnywg
-YFY+FzTbSDxUfY12aUJ8xLW8LivpmgAZMfDZ7kZ0KnPg/9vVMlt3p62By3A6/ziW
-dyodB3G5PaR9KIQ4FCqyP1rp1XjQDFhSr9nWbCLGZzxn4KRB/Q0nlQ/zKfkKyNRv
-pyDfhLMDHAEwwWlo/m0dChvdqtVt3+QfKt8vCUTmfNwsfOgBSxEXZY5MFyh+KxfC
-XxkLEtEz5TT+jAVTIqRkWu5T8ImAKreHPXacz0LdNBI5Vf+9Ijge6cHzbtVk2a7n
-l6lfRF18Bo8NyzxNG4DP+XnrUZt/L4usTGAwbD5r8gNYIsWas0FZM2gFNfz8vRf1
-nNqf/DPt9bAibY2sEmXG9ebb08Tc7GOuhZPKrA/YA4TOlR1D3tUKh0jU9mwLcgMn
-A7VZ3dQyWkvouEWyUovE
-=VnIf
+iQIcBAEBCAAGBQJRoUwQAAoJEJOE+m71LUu624oP/1ywV1VK4K69VOHfO0vDEWUa
+pHBUJ1zmyseNz6wr0j9qEo5wNR+y6Qb6w4ScyHTkUdLmyGmS7kl6qXzXUBX9mZla
+5AhMAUCMyq6CY2RFgnw90R3MQDYX6A0pTuUcZ5LaSoab9yg+hqGKHhD8lLFhORXt
+Jlt3VhfGwT7p0dONUimB3dxbqzOl+A/jxYkBHenUP+p23ewjUTswm9w7ykMYCeqG
+tHrciH1Oi2asXTtsFOoHzXu+2/gOR0fbUA1V14f0Q6VxMDk4szNUatB2idLxM7/g
+fFR4SqJZ1BoOUD9W3lAxQcqLKpz1PLdKuFEL+hpRo2uO8AuJLqG0THrHUgOLEe7A
+mwm57Ad/e5lGeclLhwVFbJLtrDxn1MAlvj+bZeepQNTKNYpa6ZF2nLzkSreNsgxb
+ITwKl983E8X9l8rxqxZzz/rI6FnJF/cjA0ROlQH3M/Q7fDzJ5KkcOXxBDhrEavz3
+MfbGeQlu2zpCOUj8/0R9jMcs1rM8g/9TmMV2L/pMM126RlEH/WPiDPX0NrN3qfQX
+SRiOnxsytOZlnTy4I2AYf/OaGJw6GkGbwqVWfCDMZNUeTiD718i3Ld4o9d5dl690
+DHua1xgZS2HwAZ3MBWGPR061hgLOvb1TjE3y+9ruwYc/Oj32YEKeUegPdmUi6GhL
+Lcd/q6otEplqtzx8nXDs
+=ks/+
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.31-r99.ebuild b/net-dns/avahi/avahi-0.6.31-r99.ebuild
index 47f59f9..a6e6e84 100644
--- a/net-dns/avahi/avahi-0.6.31-r99.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r99.ebuild
@@ -2,15 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r1.ebuild,v 1.1 2013/04/20 15:11:33 blueness Exp $
 
-EAPI="3"
+EAPI="5"
 
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="gdbm"
-PYTHON_USE_WITH_OPT="python"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE="gdbm"
 
 WANT_AUTOMAKE=1.11
 
-inherit autotools eutils mono python multilib flag-o-matic user systemd
+inherit autotools eutils mono python-r1 multilib flag-o-matic user systemd
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://avahi.org/"
@@ -19,11 +18,13 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
-kernel_linux mdnsresponder-compat mono python qt4 test utils"
+IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono python qt4 test utils"
+
+REQUIRED_USE="utils? ( !gtk !gtk3 )"
 
 DBUS_DEPEND=">=sys-apps/dbus-0.30"
-COMMON_DEPEND=">=dev-libs/libdaemon-0.14
+COMMON_DEPEND="
+	>=dev-libs/libdaemon-0.14
 	dev-libs/expat
 	dev-libs/glib:2
 	gdbm? ( sys-libs/gdbm )
@@ -69,11 +70,6 @@ pkg_setup() {
 	if use python && ! use dbus && ! use gtk; then
 		ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
 	fi
-
-	# FIXME: Use REQUIRED_USE once python.eclass gets EAPI 4 support, bug 372255
-	if use utils && ! { use gtk || use gtk3; }; then
-		ewarn "To install the avahi utilities, USE='gtk utils' or USE='gtk3 utils''"
-	fi
 }
 
 pkg_preinst() {