Fix building with x11-libs/libnotify >= 0.7. Punt useless .la files. drop old, broken

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

4 files changed, 31 insertions, 119 deletions

diff --git a/gnome-extra/avant-window-navigator-extras/ChangeLog b/gnome-extra/avant-window-navigator-extras/ChangeLog
index 06420c32f846..364a880bca1d 100644
--- a/gnome-extra/avant-window-navigator-extras/ChangeLog
+++ b/gnome-extra/avant-window-navigator-extras/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/avant-window-navigator-extras
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog,v 1.18 2010/06/23 14:37:59 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog,v 1.19 2011/01/30 17:26:44 ssuominen Exp $
+
+  30 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  avant-window-navigator-extras-0.3.2.2.ebuild,
+  +files/avant-window-navigator-extras-0.3.2.2-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7. Punt useless .la files.
 
   23 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   avant-window-navigator-extras-0.2.6-r1.ebuild,
diff --git a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.3.2.1.ebuild b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.3.2.1.ebuild
deleted file mode 100644
index 61b1fa0fbe32..000000000000
--- a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.3.2.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.3.2.1.ebuild,v 1.3 2010/06/23 14:37:59 arfrever Exp $
-
-EAPI="2"
-
-inherit eutils gnome2 python
-
-MY_P="awn-extras-applets-${PV}"
-DESCRIPTION="Applets for the avant-window-navigator"
-HOMEPAGE="http://launchpad.net/awn-extras"
-SRC_URI="https://launchpad.net/awn-extras/0.2/${PV}/+download/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome gstreamer gtkhtml"
-
-RDEPEND=">=x11-libs/libwnck-2.22
-	>=dev-python/pygobject-2
-	>=dev-python/pygtk-2
-	>=gnome-extra/avant-window-navigator-0.3.1[gnome=]
-	>=dev-libs/dbus-glib-0.70
-
-	dev-python/pyalsaaudio
-	dev-python/notify-python
-	dev-python/feedparser
-	gnome? (
-		dev-python/gnome-applets-python
-		dev-python/gnome-desktop-python
-		dev-python/gnome-keyring-python
-		dev-python/gnome-media-python
-		dev-python/gnome-vfs-python
-		dev-python/libgnomecanvas-python
-		dev-python/libgnomeprint-python
-		dev-python/libgnome-python
-		dev-python/gnome-desktop-python
-		dev-python/librsvg-python
-		dev-python/libwnck-python
-		dev-python/gconf-python
-		gnome-base/gnome-menus[python]
-		gnome-base/librsvg
-		>=gnome-base/libgtop-2
-		>=gnome-base/gconf-2
-		x11-libs/vte[python]
-		>=gnome-base/gnome-vfs-2
-	)
-	gtkhtml? ( dev-python/gtkmozembed-python )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.15
-		dev-python/gst-python )
-	gnome-extra/avant-window-navigator
-	x11-libs/libXcomposite
-	x11-libs/libXrender
-	x11-libs/libsexy
-	x11-libs/libnotify"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.17
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use gstreamer; then
-		G2CONF="${G2CONF} --enable-sound=gstreamer"
-	else
-		G2CONF="${G2CONF} --enable-sound=no"
-	fi
-
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-pymod-checks
-		$(use_with gnome)
-		$(use_with gnome gconf)"
-}
-
-src_prepare() {
-	# Disable pyc compiling.
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use gnome ; then
-		# Give the gconf schemas non-conflicting names.
-		mv "${D}/etc/gconf/schemas/notification-daemon.schemas" \
-			"${D}/etc/gconf/schemas/awn-notification-daemon.schemas"
-		mv "${D}/etc/gconf/schemas/awnsystemmonitor.schemas" \
-			"${D}/etc/gconf/schemas/awn-system-monitor.schemas"
-		mv "${D}/etc/gconf/schemas/filebrowser.schemas" \
-			"${D}/etc/gconf/schemas/awn-filebrowser.schemas"
-		mv "${D}/etc/gconf/schemas/switcher.schemas" \
-			"${D}/etc/gconf/schemas/awn-switcher.schemas"
-		mv "${D}/etc/gconf/schemas/trash.schemas" \
-			"${D}/etc/gconf/schemas/awn-trash.schemas"
-		mv "${D}/etc/gconf/schemas/shinyswitcher.schemas" \
-			"${D}/etc/gconf/schemas/awn-shinyswitcher.schemas"
-		mv "${D}/etc/gconf/schemas/places.schemas" \
-			"${D}/etc/gconf/schemas/awn-places.schemas"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize $(python_get_sitedir)/awn/extras
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup $(python_get_sitedir)/awn/extras
-}
diff --git a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.3.2.2.ebuild b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.3.2.2.ebuild
index e601eead43d8..6a233eb5f99e 100644
--- a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.3.2.2.ebuild
+++ b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.3.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.3.2.2.ebuild,v 1.2 2010/06/23 14:37:59 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.3.2.2.ebuild,v 1.3 2011/01/30 17:26:44 ssuominen Exp $
 
 EAPI="2"
 
@@ -85,6 +85,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
 	# Disable pyc compiling.
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
@@ -110,6 +112,8 @@ src_install() {
 		mv "${D}/etc/gconf/schemas/places.schemas" \
 			"${D}/etc/gconf/schemas/awn-places.schemas"
 	fi
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
 }
 
 pkg_postinst() {
diff --git a/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.3.2.2-libnotify-0.7.patch b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.3.2.2-libnotify-0.7.patch
new file mode 100644
index 000000000000..dd22e13aebc2
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.3.2.2-libnotify-0.7.patch
@@ -0,0 +1,18 @@
+--- src/libawn-extras/notify.c
++++ src/libawn-extras/notify.c
+@@ -43,7 +43,15 @@
+ 		expire_timeout=timeout;
+ 	}			
+     notify_init("notify-send");
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	notify = notify_notification_new(summary, body, icon_str);
++#else
+ 	notify = notify_notification_new(summary, body, icon_str, NULL);
++#endif
++#else
++	notify = notify_notification_new(summary, body, icon_str, NULL);
++#endif
+ 	if (notify)
+ 	{
+ 		notify_notification_set_category(notify, type);