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

Package-Manager: portage-2.1.4_rc4

5 files changed, 65 insertions, 32 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/Manifest b/gnome-extra/avant-window-navigator-extras/Manifest
index 027d1f6db13c..06d483f65c91 100644
--- a/gnome-extra/avant-window-navigator-extras/Manifest
+++ b/gnome-extra/avant-window-navigator-extras/Manifest
@@ -1,16 +1,16 @@
 DIST awn-extras-applets-0.2.1.tar 1237755 RMD160 ab91466aaf95cd345a275d8e6d1cb6fe15fd8dbf SHA1 d19dd1693a1a99613393006f846246c8328f68c9 SHA256 4590eb6fff3a549b9b4e0903c8947a84a08d10add6d27939df094a5717ee460a
-EBUILD avant-window-navigator-extras-0.2.1.ebuild 649 RMD160 c40f825f4f402d09c932b2b077c8dfe29d8c56e4 SHA1 f80175387fe4653be9116ae506e493840b88a3ec SHA256 89f0f88b42c1fef3f4034ea5d2e3913a15bcd60f349d7110e21c75874e72ee6b
-MD5 dc5909f1f0544bd87b663e812517cd60 avant-window-navigator-extras-0.2.1.ebuild 649
-RMD160 c40f825f4f402d09c932b2b077c8dfe29d8c56e4 avant-window-navigator-extras-0.2.1.ebuild 649
-SHA256 89f0f88b42c1fef3f4034ea5d2e3913a15bcd60f349d7110e21c75874e72ee6b avant-window-navigator-extras-0.2.1.ebuild 649
-MISC ChangeLog 551 RMD160 00115e1f7f3a76e0bd5d7ff3963331d3adc5bd26 SHA1 323a7b4f26fe71e12186d89638e8cfd94abdbaa0 SHA256 0d89259cb3ff7066280ab8ccdc25b061675879ed4d51e559778e65795c75660d
-MD5 4e0cbd7f15400e9e3e625e231e02676c ChangeLog 551
-RMD160 00115e1f7f3a76e0bd5d7ff3963331d3adc5bd26 ChangeLog 551
-SHA256 0d89259cb3ff7066280ab8ccdc25b061675879ed4d51e559778e65795c75660d ChangeLog 551
+EBUILD avant-window-navigator-extras-0.2.1-r1.ebuild 1352 RMD160 950e1521b67306d2c0fd449ad52aa9728fcb6ed9 SHA1 eadf7ff820ad3ef1781bf29a469f21cb72d5a512 SHA256 3f7f65ea8821f57a5ea10739a15dad438b6973afced865b05c2fec1cb35c6a52
+MD5 1bf0fb695af23273ce23ccc3c3fd1108 avant-window-navigator-extras-0.2.1-r1.ebuild 1352
+RMD160 950e1521b67306d2c0fd449ad52aa9728fcb6ed9 avant-window-navigator-extras-0.2.1-r1.ebuild 1352
+SHA256 3f7f65ea8821f57a5ea10739a15dad438b6973afced865b05c2fec1cb35c6a52 avant-window-navigator-extras-0.2.1-r1.ebuild 1352
+MISC ChangeLog 980 RMD160 d65d8053b810cb4dfb2705100775c2c3ea6e256c SHA1 f1efda9beee269746d0d99cc4acc96ab8b26bfe5 SHA256 3c1f73bea0a2599fcf2fdf580b33bd8d237afceb981cc3adae2278471c65eded
+MD5 69ca13f3542cc153cedf07b863fbcd2e ChangeLog 980
+RMD160 d65d8053b810cb4dfb2705100775c2c3ea6e256c ChangeLog 980
+SHA256 3c1f73bea0a2599fcf2fdf580b33bd8d237afceb981cc3adae2278471c65eded ChangeLog 980
 MISC metadata.xml 390 RMD160 c1af6dd0e28c776a53996d7a251e7ab8d771d2c2 SHA1 176384d8fb504351823d95df4674428e7fc3f495 SHA256 128d7a33fd6c5d258af7719fe29b58c19722eb6e0dd808b1440dd6005ec04ec0
 MD5 7d056a6a4a3469f09829418dd0ee6d75 metadata.xml 390
 RMD160 c1af6dd0e28c776a53996d7a251e7ab8d771d2c2 metadata.xml 390
 SHA256 128d7a33fd6c5d258af7719fe29b58c19722eb6e0dd808b1440dd6005ec04ec0 metadata.xml 390
-MD5 f7a760c5e74e6c3190156cc90eb00190 files/digest-avant-window-navigator-extras-0.2.1 268
-RMD160 2a2ab8204f05f8ffefd4c47971a1b15ae1507623 files/digest-avant-window-navigator-extras-0.2.1 268
-SHA256 a95fd876fc88332803dca11a102b56fd4981481b3afe215d3173a3f4537539ab files/digest-avant-window-navigator-extras-0.2.1 268
+MD5 f7a760c5e74e6c3190156cc90eb00190 files/digest-avant-window-navigator-extras-0.2.1-r1 268
+RMD160 2a2ab8204f05f8ffefd4c47971a1b15ae1507623 files/digest-avant-window-navigator-extras-0.2.1-r1 268
+SHA256 a95fd876fc88332803dca11a102b56fd4981481b3afe215d3173a3f4537539ab files/digest-avant-window-navigator-extras-0.2.1-r1 268
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