net-dns/avahi: continue switch to python-r1

Package-Manager: portage-2.1.11.62

2 files changed, 2 insertions, 34 deletions

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index cd3968e..96819fb 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX autoipd-openrc.sh 700 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0 SHA512 a5dbbac4d6d1959db3a07a63acb7569dbeba33d2274a1dd3253dc27687549371611cf08bad3998d89efb3ace63b5541a4d225e484274450e0c82661f5a1dbc32 WHIRLPOOL e6b256655f64f557338ae5f79eaf98ead572d39cf90c76ca270dc54cee4b5edfc087326e5f04166eb2ff232ec2a8a5b87adadc8b3bd8b2ec2e3b6503ca39bee6
 AUX autoipd.sh 1271 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3 WHIRLPOOL b33889de73f571b18da092342be6a47e71d608466aa0d94fa3f0d8d7e373265767a62bdfb82df31059549e4ec0d05aacef89f1778ea561152fd5e1970072584c
 AUX avahi-0.6.30-automake-1.11.2.patch 3256 SHA256 bcfd79cb5c74c2ec17d7320d9302c6946282b36e306ab16261aec0de590a5423 SHA512 0e9603fd8389d9eb1f6ef66cdfffbd962f2ea98216613e323ff4ede00d8d0f13530607ac668e81c9c73a8e7ea9888e071bf1ed13e68b7bbc7dc890e1a7050fbe WHIRLPOOL 36b27ea86d162bd3e57561c2b3287daea23337067348c23f2b37862b1a6d356e2d7918d73f4e4235576d085637b035c0ac6f1bb099970957cfbdb8dc86a6e6fc
@@ -10,23 +7,6 @@ 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 5897 SHA256 73c8d72a11f62448d86172543776b3deaff4c50a79a2c4cc9699adc3adb7667f SHA512 e68f5c36bd81c41f7eaaeb3eb3272ec545a99fab7955ca913a05c9f9f319b6b4f28c1f23fa8d3adf86a0ffe1d2d03c92f80417dcd95bde72162c07fce0e55d2a WHIRLPOOL 70d1f64633a4885be81a335649fbfa0f6c6b506f171eca2a97c249454a897ac4e450eead106289ae9c7007c4a641da4bf74584582a8bcd7ba8e94509eda06c1c
+EBUILD avahi-0.6.31-r99.ebuild 5637 SHA256 974924c7dccb249d61f387978882f6ccb4b03be0e08f5ab4950be9eb1d20bbb4 SHA512 7288e2a7ad22e46ea4a241ae0e822dc72d1ac37d01a76c71deef248ed21a66641f73bf141231665aeee85ad2d632b4b6e754fd9a956051bdf609cad9f7cfc1d6 WHIRLPOOL 304d638ad5d97efe6a1cc47b8dcfc07747d0387c02bbf1f6b55593b7d6e26fcf13e0f21cb4d8f4ff06da0ec9a9989ec9be01459f7ce38504fa14731ef0c7b4b8
 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)
-
-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 a6e6e84..a035865 100644
--- a/net-dns/avahi/avahi-0.6.31-r99.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r99.ebuild
@@ -62,11 +62,6 @@ RDEPEND="${COMMON_DEPEND}
 	mdnsresponder-compat? ( !net-misc/mDNSResponder )"
 
 pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
 	if use python && ! use dbus && ! use gtk; then
 		ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
 	fi
@@ -121,6 +116,7 @@ src_configure() {
 	local myconf="--disable-static"
 
 	if use python; then
+		python_export_best
 		myconf+="
 			$(use_enable dbus python-dbus)
 			$(use_enable gtk pygtk)
@@ -204,21 +200,13 @@ src_install() {
 	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
-pkg_postrm() {
-	use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
-}
-
 pkg_postinst() {
-	use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover)
-
 	if use autoipd; then
-		echo
 		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
 		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
 	fi
 
 	if use dbus; then
-		echo
 		elog "If this is your first install of avahi please reload your dbus config"
 		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
 	fi