Fixed colliding issue with schemas per bug #198647. Patch fix submitted by Pacho Ramos.

(Portage version: 2.1.4_rc4)

4 files changed, 54 insertions, 21 deletions

diff --git a/gnome-extra/avant-window-navigator-extras/ChangeLog b/gnome-extra/avant-window-navigator-extras/ChangeLog
index 69c4fa75ff07..aabbb71530b7 100644
--- a/gnome-extra/avant-window-navigator-extras/ChangeLog
+++ b/gnome-extra/avant-window-navigator-extras/ChangeLog
@@ -1,6 +1,18 @@
 # 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.2 2007/11/10 03:57:14 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/avant-window-navigator-extras/ChangeLog,v 1.3 2007/12/06 17:42:36 wltjr Exp $
+
+*avant-window-navigator-extras-0.2.1-r1 (06 Dec 2007)
+
+  06 Dec 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -avant-window-navigator-extras-0.2.1.ebuild,
+  +avant-window-navigator-extras-0.2.1-r1.ebuild:
+  Fixed colliding issue with schemas per bug #198647. Patch fix submitted by
+  Pacho Ramos.
+
+  29 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  avant-window-navigator-extras-0.2.1.ebuild:
+  Corrected/added deps
 
   10 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org> metadata.xml:
   Corrected metadata
diff --git a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.1-r1.ebuild b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..f7bdaaa2135a
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 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.1-r1.ebuild,v 1.1 2007/12/06 17:42:36 wltjr Exp $
+
+inherit gnome2
+
+MY_P="awn-extras-applets-${PV}"
+DESCRIPTION="Applets for the avant-window-navigator"
+HOMEPAGE="http://launchpad.net/awn-extras"
+SRC_URI="http://launchpad.net/awn-extras/${PV}/${PV}/+download/awn-extras-applets-${PV}.tar"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/pyalsaaudio
+	gnome-base/gnome-menus
+	gnome-base/librsvg
+	gnome-base/libgtop
+	gnome-extra/avant-window-navigator
+	net-libs/libgmail
+	x11-libs/libsexy
+	x11-libs/libnotify"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	gnome2_src_install
+	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"
+}
diff --git a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.1.ebuild b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.1.ebuild
deleted file mode 100644
index 28ee5e19d677..000000000000
--- a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2007 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.1.ebuild,v 1.1 2007/11/10 03:13:17 wltjr Exp $
-
-inherit gnome2
-
-MY_P="awn-extras-applets-${PV}"
-DESCRIPTION="Applets for the avant-window-navigator"
-HOMEPAGE="http://launchpad.net/awn-extras"
-SRC_URI="http://launchpad.net/awn-extras/${PV}/${PV}/+download/awn-extras-applets-${PV}.tar"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="gnome-extra/avant-window-navigator"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/gnome-extra/avant-window-navigator-extras/files/digest-avant-window-navigator-extras-0.2.1 b/gnome-extra/avant-window-navigator-extras/files/digest-avant-window-navigator-extras-0.2.1-r1
index 42aa69489dd2..42aa69489dd2 100644
--- a/gnome-extra/avant-window-navigator-extras/files/digest-avant-window-navigator-extras-0.2.1
+++ b/gnome-extra/avant-window-navigator-extras/files/digest-avant-window-navigator-extras-0.2.1-r1