Fix shebangs, bug 383773. Clean old versions

(Portage version: 2.1.10.41/cvs/Linux x86_64)

3 files changed, 47 insertions, 25 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/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() {