Fix shebangs, bug 383773. Clean old versions

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 50 insertions, 38 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 232c26dd4083..bedb284305d9 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.211 2011/12/18 22:19:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.212 2011/12/24 17:03:27 maksbotan Exp $
 
   18 Dec 2011; Markus Meier <maekke@gentoo.org> avahi-0.6.30-r1.ebuild:
   arm stable, bug #393009
@@ -11,6 +11,13 @@
   16 Dec 2011; Jeroen Roovers <jer@gentoo.org> avahi-0.6.30-r1.ebuild:
   Stable for HPPA (bug #393009).
 
+*avahi-0.6.30-r2 (24 Dec 2011)
+*avahi-0.6.29-r1 (24 Dec 2011)
+
+  24 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> -avahi-0.6.29.ebuild,
+  +avahi-0.6.29-r1.ebuild, -avahi-0.6.30.ebuild, +avahi-0.6.30-r2.ebuild:
+  Fix shebangs, bug 383773. Clean old versions
+
   15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> avahi-0.6.30-r1.ebuild:
   Stable for AMD64, wrt bug #393009
 
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index b6247f01834b..6449f0dce959 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX autoipd-openrc.sh 700 RMD160 00e259967279dc52ee99476dfb4d6c9672b77ee3 SHA1 1d9858b99f23688f6a0f4a6726400bbbe41df976 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
 AUX avahi-0.6.28-CVE-2011-1002.patch 2076 RMD160 0b561a78e75099a14e7a3da5290cd1ffa6a75533 SHA1 6d298861d7c7b432cd350f3df277e43ed59b378b SHA256 bf8422b278c0c66eca063672c4836346a4d85cb16014882ca3003b0a79ba9f97
@@ -11,15 +8,8 @@ DIST avahi-0.6.28.tar.gz 1238660 RMD160 d61b370baa3f25d57efba43f2c34b54cab7e7e9e
 DIST avahi-0.6.29.tar.gz 1244081 RMD160 a0a4e1019cafb53a683ceceaa44605873957b6cd SHA1 af13ae6fdb3cd61b2eafa25a108773156d88b362 SHA256 4eb1a6bdc93f1b245fc1b26ff6a79f5f958c1135c04bff60d36d374d98cc14d8
 DIST avahi-0.6.30.tar.gz 1243534 RMD160 99dbc4f5711fd2962ac657811bebdb63947bd2c1 SHA1 5b77443537600a00770e4c77e3c443eeb5861d06 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
 EBUILD avahi-0.6.28-r1.ebuild 4934 RMD160 7ebe1201b97f00f08a330211f8f81b07e3d17250 SHA1 4bc99179361a3a55234dbd6f646ce958bbe96e61 SHA256 fb564902531fd9e2059456b2e4659ac0f66ca6e8c1dc0911b9c7fc1cf6c1eed5
-EBUILD avahi-0.6.29.ebuild 4943 RMD160 33f586f04be104586802412233744aa696c4a8e2 SHA1 31c5d9270f3e80db1b000f1ffabc47e1ef271ed2 SHA256 e08eb60cfabdc32bfbf15da89d1f0ab427d94e2cd5825f61c151023add8ef159
+EBUILD avahi-0.6.29-r1.ebuild 5007 RMD160 3c321fb99b76e27b0d2bd38e334ba9ea0c399e2e SHA1 f24ce1086f9d2263a8748a109cd3b6641ca6406e SHA256 08e3531a21bc67c58d51f74291536c1e8c7cc4dbe1b08021f853e500c4974aea
 EBUILD avahi-0.6.30-r1.ebuild 5561 RMD160 9198ae62b310834296631b3c9dc8cfd082bac722 SHA1 f74536399f5fddfd9d4ae305622b44c163d77a35 SHA256 bb381e2c8ce8b580e28d1f58c1f5f723a2a47219d606308f2a4f2eaa718ffd0c
-EBUILD avahi-0.6.30.ebuild 4969 RMD160 faa2918121ae7936f19bbf4769e93b6690e2cd48 SHA1 0b30a56b729f637b5c0b2ca09762afe45dec01b2 SHA256 f3d6780b562aefdb54752dc373290006e13a76ecf17a975e249bb88d67ee9514
-MISC ChangeLog 31495 RMD160 43f1d68fdd9d82ae8eddc116844f83cf74a0443e SHA1 6a31bdb445ecb9b65245cce6e17876a57f75cebc SHA256 eed8849840760374d4fd7176a05031c13e183e70fdd79b94e7293cb8d552c0d6
+EBUILD avahi-0.6.30-r2.ebuild 5632 RMD160 95be11309c5cb929bfcd223294be8e1a9f2df228 SHA1 69b6b086a1600c805544df2f8d01d187b7301f05 SHA256 cf2e32c94d1c96df6c3854b797c048d7ca5facc984403bf309d8247a836de11c
+MISC ChangeLog 31757 RMD160 8fefbee55b8549dbbef72e4c5596d751e6d357df SHA1 2f1801387fefb1144640627aa1d9bf6cda112a88 SHA256 fd57670e087c619492da13af1dba8ccdb9aa7d2043dc18b18ccc832e1d32c9d0
 MISC metadata.xml 892 RMD160 9bca92d3dc0b1ca1ebb7de98fcb6c414028ce376 SHA1 4c2a8a417838011d8a8027fd097661ab262e7bbc SHA256 37689509fa8cae032b27236bf754a0060a21c79c03faa11630f606996e6062cc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk7uZ4MACgkQkKaRLQcq0GKuSQCdEgoz2oseU9uEvpsJ7PSKooEz
-WYIAn0jk+vU1u9aV8S2Pfp4uQ5LZDYbY
-=eotm
------END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.29.ebuild b/net-dns/avahi/avahi-0.6.29-r1.ebuild
index 81fcb73e207e..4989c382dd02 100644
--- a/net-dns/avahi/avahi-0.6.29.ebuild
+++ b/net-dns/avahi/avahi-0.6.29-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.29.ebuild,v 1.2 2011/10/23 16:40:49 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.29-r1.ebuild,v 1.1 2011/12/24 17:03:27 maksbotan Exp $
 
 EAPI="3"
 
@@ -178,6 +178,7 @@ src_install() {
 		insinto /usr/share/devhelp/books/avahi
 		doins avahi.devhelp || die
 	fi
+	python_convert_shebangs 2 "${ED}"usr/bin/avahi-discover || die
 }
 
 pkg_postrm() {
diff --git a/net-dns/avahi/avahi-0.6.30.ebuild b/net-dns/avahi/avahi-0.6.30-r2.ebuild
index eff43ffd1278..f4c5deb3b024 100644
--- a/net-dns/avahi/avahi-0.6.30.ebuild
+++ b/net-dns/avahi/avahi-0.6.30-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30.ebuild,v 1.3 2011/10/23 16:40:49 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r2.ebuild,v 1.1 2011/12/24 17:03:27 maksbotan Exp $
 
 EAPI="3"
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="python? 2"
 PYTHON_USE_WITH="gdbm"
 PYTHON_USE_WITH_OPT="python"
 
-inherit eutils mono python multilib flag-o-matic
+inherit autotools eutils mono python multilib flag-o-matic
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://avahi.org/"
@@ -17,17 +17,17 @@ 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 ~x86-fbsd ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux mdnsresponder-compat mono python qt4 test "
+IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
+kernel_linux mdnsresponder-compat mono python qt4 test utils"
 
 DBUS_DEPEND=">=sys-apps/dbus-0.30"
-RDEPEND=">=dev-libs/libdaemon-0.14
+COMMON_DEPEND=">=dev-libs/libdaemon-0.14
 	dev-libs/expat
-	>=dev-libs/glib-2
+	dev-libs/glib:2
 	gdbm? ( sys-libs/gdbm )
 	qt4? ( x11-libs/qt-core:4 )
-	gtk? (
-		>=x11-libs/gtk+-2.14.0:2
-	)
+	gtk? ( >=x11-libs/gtk+-2.14.0:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	dbus? (
 		${DBUS_DEPEND}
 		python? ( dev-python/dbus-python )
@@ -36,14 +36,9 @@ RDEPEND=">=dev-libs/libdaemon-0.14
 		>=dev-lang/mono-1.1.10
 		gtk? ( >=dev-dotnet/gtk-sharp-2 )
 	)
-	howl-compat? (
-		!net-misc/howl
-		${DBUS_DEPEND}
-	)
-	mdnsresponder-compat? (
-		!net-misc/mDNSResponder
-		${DBUS_DEPEND}
-	)
+	howl-compat? ( ${DBUS_DEPEND} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	mdnsresponder-compat? ( ${DBUS_DEPEND} )
 	python? (
 		gtk? ( >=dev-python/pygtk-2 )
 	)
@@ -52,13 +47,16 @@ RDEPEND=">=dev-libs/libdaemon-0.14
 		dev-python/twisted-web
 	)
 	kernel_linux? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.5
 	>=dev-util/pkgconfig-0.9.0
 	doc? (
 		app-doc/doxygen
 		mono? ( >=virtual/monodoc-1.1.8 )
 	)"
+RDEPEND="${COMMON_DEPEND}
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )"
 
 pkg_setup() {
 	if use python; then
@@ -69,6 +67,11 @@ 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() {
@@ -93,14 +96,22 @@ src_prepare() {
 		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
 		doxygen_to_devhelp.xsl || die
 
+	# Make gtk utils optional
+	epatch "${FILESDIR}/${PN}-0.6.30-optional-gtk-utils.patch"
+
 	# Fix init scripts for >=openrc-0.9.0 (bug #383641)
 	epatch "${FILESDIR}/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch"
+
+	# Drop DEPRECATED flags, bug #384743
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
+
+	eautoreconf
 }
 
 src_configure() {
 	use sh && replace-flags -O? -O0
 
-	local myconf=""
+	local myconf="--disable-static"
 
 	if use python; then
 		myconf+="
@@ -121,9 +132,6 @@ src_configure() {
 	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
 	unset DISPLAY
 
-	# Upstream ships a gir file (AvahiCore.gir) which does not work with
-	# >=gobject-introspection-0.9, so we disable introspection for now.
-	# http://avahi.org/ticket/318
 	econf \
 		--localstatedir="${EPREFIX}/var" \
 		--with-distro=gentoo \
@@ -131,8 +139,8 @@ src_configure() {
 		--disable-pygtk \
 		--disable-xmltoman \
 		--disable-monodoc \
-		--disable-introspection \
 		--enable-glib \
+		--enable-gobject \
 		$(use_enable test tests) \
 		$(use_enable autoipd) \
 		$(use_enable mdnsresponder-compat compat-libdns_sd) \
@@ -141,8 +149,10 @@ src_configure() {
 		$(use_enable mono) \
 		$(use_enable dbus) \
 		$(use_enable python) \
-		--disable-gtk3 \
 		$(use_enable gtk) \
+		$(use_enable gtk3) \
+		$(use_enable introspection) \
+		$(use_enable utils gtk-utils) \
 		--disable-qt3 \
 		$(use_enable qt4) \
 		$(use_enable gdbm) \
@@ -178,6 +188,10 @@ src_install() {
 		insinto /usr/share/devhelp/books/avahi
 		doins avahi.devhelp || die
 	fi
+	python_convert_shebangs 2 "${ED}"usr/bin/avahi-discover || die
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f {} + || die
 }
 
 pkg_postrm() {