Bumped to latest release, merged in some ebuild changes from bug #146299.

Package-Manager: portage-2.1.4.1

4 files changed, 135 insertions, 3 deletions

diff --git a/gnome-extra/avant-window-navigator-extras/ChangeLog b/gnome-extra/avant-window-navigator-extras/ChangeLog
index aabbb71530b7..09d94792a6c7 100644
--- a/gnome-extra/avant-window-navigator-extras/ChangeLog
+++ b/gnome-extra/avant-window-navigator-extras/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/avant-window-navigator-extras
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog,v 1.3 2007/12/06 17:42:36 wltjr Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog,v 1.4 2008/03/25 20:49:01 wltjr Exp $
+
+*avant-window-navigator-extras-0.2.6 (25 Mar 2008)
+
+  25 Mar 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/0.2.6-r346-gconf-conditional.patch,
+  +avant-window-navigator-extras-0.2.6.ebuild:
+  Bumped to latest release, merged in some ebuild changes from bug #146299.
 
 *avant-window-navigator-extras-0.2.1-r1 (06 Dec 2007)
 
diff --git a/gnome-extra/avant-window-navigator-extras/Manifest b/gnome-extra/avant-window-navigator-extras/Manifest
index 75fbb044e8ce..ccc16b952186 100644
--- a/gnome-extra/avant-window-navigator-extras/Manifest
+++ b/gnome-extra/avant-window-navigator-extras/Manifest
@@ -1,4 +1,7 @@
+AUX 0.2.6-r346-gconf-conditional.patch 1006 RMD160 f6c3ef58ee172366751549aefb92b0ecb0aa1c2b SHA1 30e4735269dcd5a5367cd95383042d1e2d43b3d4 SHA256 dbc94be180173fe107fbdfc812f243c8607507f0724d15286bdef13b5c8d9ebe
 DIST awn-extras-applets-0.2.1.tar 1237755 RMD160 ab91466aaf95cd345a275d8e6d1cb6fe15fd8dbf SHA1 d19dd1693a1a99613393006f846246c8328f68c9 SHA256 4590eb6fff3a549b9b4e0903c8947a84a08d10add6d27939df094a5717ee460a
+DIST awn-extras-applets-0.2.6.tar.gz 2923066 RMD160 9f688f35bb3c1effcb358b69af625867c2f892dc SHA1 8d73ffcc8da27557d7f46bfd5cc5239a5d7eb50a SHA256 09cd77510d154a7584004bef4d3c1d174a05ffe3c4c5ae17680b294a2d8699e2
 EBUILD avant-window-navigator-extras-0.2.1-r1.ebuild 1352 RMD160 950e1521b67306d2c0fd449ad52aa9728fcb6ed9 SHA1 eadf7ff820ad3ef1781bf29a469f21cb72d5a512 SHA256 3f7f65ea8821f57a5ea10739a15dad438b6973afced865b05c2fec1cb35c6a52
-MISC ChangeLog 980 RMD160 d65d8053b810cb4dfb2705100775c2c3ea6e256c SHA1 f1efda9beee269746d0d99cc4acc96ab8b26bfe5 SHA256 3c1f73bea0a2599fcf2fdf580b33bd8d237afceb981cc3adae2278471c65eded
+EBUILD avant-window-navigator-extras-0.2.6.ebuild 2680 RMD160 2d3904a5939d8813ff85efd19c09dc09075e6e9a SHA1 7061de7a8743023ceaad140710f562bc0f9723dd SHA256 a811b98017f9d0130014742b4605a5339436c500b9e3dcaf7bd8e9dd8b5668fd
+MISC ChangeLog 1258 RMD160 23bcf0a77bc8438738fc3c0c41255641d3ecacb0 SHA1 354d901132ea1698b5d0cff4287a71c17760fd44 SHA256 b6e190934544dd91e4c108e9d25624681222e91c2a0b2e455d4f905747bcfbf3
 MISC metadata.xml 390 RMD160 c1af6dd0e28c776a53996d7a251e7ab8d771d2c2 SHA1 176384d8fb504351823d95df4674428e7fc3f495 SHA256 128d7a33fd6c5d258af7719fe29b58c19722eb6e0dd808b1440dd6005ec04ec0
diff --git a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6.ebuild b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6.ebuild
new file mode 100644
index 000000000000..049bb0e526f1
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.6.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2008 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.2.6.ebuild,v 1.1 2008/03/25 20:49:01 wltjr Exp $
+
+inherit autotools 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/${PV%.*}/${PV}/+download/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome"
+
+DEPEND="dev-python/pyalsaaudio
+	gnome-base/gnome-menus
+	gnome-base/librsvg
+	gnome-base/libgtop
+	gnome-extra/avant-window-navigator
+	x11-libs/libsexy
+	x11-libs/libnotify"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS Changelog NEWS README"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use gnome && ! built_with_use gnome-extra/avant-window-navigator gnome ; then
+		eerror "Please re-emerge gnome-extra/avant-window-navigator with the gnome USE flag set"
+		die "avant-window-navigator needs the gnome flag set"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Apply a fix from awn bzr to make gconf truly conditional.
+	epatch "${FILESDIR}"/${PV}-r346-gconf-conditional.patch
+	eautoconf
+
+	# Disable pyc compiling.
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+src_compile() {
+	# Not disabling pymod-checks results in a sandbox access violation.
+	econf --disable-pymod-checks \
+			$(use_with gnome) \
+			$(use_with gnome gconf) \
+			|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+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_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/awn/extras
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_version
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/awn/extras
+}
diff --git a/gnome-extra/avant-window-navigator-extras/files/0.2.6-r346-gconf-conditional.patch b/gnome-extra/avant-window-navigator-extras/files/0.2.6-r346-gconf-conditional.patch
new file mode 100644
index 000000000000..578c351af969
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/files/0.2.6-r346-gconf-conditional.patch
@@ -0,0 +1,31 @@
+--- configure.ac.orig	2008-02-22 16:39:35.000000000 +0100
++++ configure.ac	2008-03-13 22:21:18.000000000 +0100
+@@ -18,14 +18,6 @@
+ AC_PROG_LIBTOOL
+ 
+ dnl ==============================================
+-dnl gconf stuff
+-dnl ==============================================
+-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+-if test x"$GCONFTOOL" = xno; then
+-  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+-fi
+-
+-dnl ==============================================
+ dnl translation support
+ dnl ==============================================
+ 
+@@ -243,6 +235,13 @@
+ dnl ==============================================
+ dnl GConf
+ dnl ==============================================
++if test "$with_gconf" != "no"; then
++AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
++  if test x"$GCONFTOOL" = xno; then
++    AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
++  fi
++fi
++
+ AM_GCONF_SOURCE_2
+ 
+ dnl Please keep in alphabetical order