add nautilus and eog extensions for conduit, bump vobject

svn path=/; revision=66

5 files changed, 35 insertions, 18 deletions

diff --git a/app-admin/conduit/Manifest b/app-admin/conduit/Manifest
index fc48512..4558444 100644
--- a/app-admin/conduit/Manifest
+++ b/app-admin/conduit/Manifest
@@ -1,2 +1,3 @@
+AUX conduit-0.3.9_correct_firefox_path.patch 450 RMD160 1bee9c2965dcf959a094b6e1adcea2882ada8dbf SHA1 007e05d95cbe7a29c189e1e3445d5b316b72e1ad SHA256 e89103d2747f9476586d5a4a8135c3578695a3aaa2579d53500c12e1b5c54165
 DIST conduit-0.3.9.tar.bz2 691634 RMD160 22d1f316c34a7570297292f7d3ae9565c311eb41 SHA1 b7528d5e627ce06539f0102ad7bb99edeb64b2d7 SHA256 b2155dd3266a3f7a0f7bcd64700ca9361cfec7fcc4e7c0147dd715e4c81ebdd0
-EBUILD conduit-0.3.9.ebuild 890 RMD160 9cbcbee07bd8246ede969aa58d30fad008188428 SHA1 399d9c43d305175d3ff6ee40c63ad027656642d3 SHA256 eda88fcfaf71df1935b70fb84fc5a7326e7e873166c9b1a297185651ef3ae6f7
+EBUILD conduit-0.3.9.ebuild 1038 RMD160 f21f786775e19843bb903fd907918833a980a0bd SHA1 e92c2e85488b8b1456daee09424e2f1ba78384da SHA256 5c8b7ca00c048eefd34a74c4571fcb6d18d94aee3c6e183c1327311747872aed
diff --git a/app-admin/conduit/conduit-0.3.9.ebuild b/app-admin/conduit/conduit-0.3.9.ebuild
index 8a7f2b1..414b85a 100644
--- a/app-admin/conduit/conduit-0.3.9.ebuild
+++ b/app-admin/conduit/conduit-0.3.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit gnome2 python multilib
+inherit eutils gnome2 python multilib
 
 DESCRIPTION="A Desktop Synchronization Solution for GNOME"
 HOMEPAGE="http://www.conduit-project.org/"
@@ -10,30 +10,35 @@ HOMEPAGE="http://www.conduit-project.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="python"
+IUSE="gnome nautilus"
 
-RDEPEND=">=virtual/python-2.4
-		>=x11-libs/gtk+-2.10
+RDEPEND=">=virtual/python-2.5
 		>=dev-python/pygtk-2.10
-		dev-python/pyxml
+		>=dev-python/pyxml-0.8.4
 		dev-python/vobject
 		>=dev-python/dbus-python-0.80
-		dev-python/pygoocanvas
-		dev-python/gnome-python
+		>=dev-python/pygoocanvas-0.9
 		dev-python/python-dateutil
-		dev-python/elementtree
-		python? ( >=dev-python/evolution-python-0.0.3 )"
+		>=dev-python/pysqlite-2.3
+		|| ( dev-python/elementtree >=virtual/python-2.5 )
+		|| ( >=dev-python/evolution-python-0.0.3 >=dev-python/gnome-python-desktop-2.22 )
+		gnome? ( gnome-base/nautilus
+			media-gfx/eog )"
 DEPEND="${RDEPEND}
 		  sys-devel/gettext
 		>=dev-util/intltool-0.35
 		>=dev-util/pkgconfig-0.19"
 
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/conduit
+
+pkg_setup() {
+
+	G2CONF="${G2CONF} $(use_enable gnome nautilus-extension) $(use_enable gnome eog-plugin)"
+
 }
 
-pkg_postrm() {
-	python_version
-	python_mod_cleanup
+src_unpack() {
+
+	unpack ${A}
+	epatch ${FILESDIR}/${P}_correct_firefox_path.patch
+
 }
diff --git a/app-admin/conduit/files/conduit-0.3.9_correct_firefox_path.patch b/app-admin/conduit/files/conduit-0.3.9_correct_firefox_path.patch
new file mode 100644
index 0000000..d2e4cf3
--- /dev/null
+++ b/app-admin/conduit/files/conduit-0.3.9_correct_firefox_path.patch
@@ -0,0 +1,11 @@
+--- conduit-0.3.9/conduit/conduit.orig	2007-11-29 01:29:17.000000000 +0100
++++ conduit-0.3.9/conduit/conduit	2008-03-03 02:17:58.000000000 +0100
+@@ -7,7 +7,7 @@
+ 
+ # Run mozilla takes care of settin up the appropriate environment variables
+ # to run a program using mozilla libs
+-FF_PATH=`ls -d /usr/lib/firefox* | tail -n 1`
++FF_PATH=`ls -d /usr/lib/mozilla-firefox* | tail -n 1`
+ RUN_MOZILLA=$FF_PATH/run-mozilla.sh
+ 
+ if [ -x $RUN_MOZILLA ]; then
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index 3cd57b0..ed84214 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,2 +1,2 @@
-DIST vobject-0.4.8.tar.gz 50707 RMD160 4d40151c40adae0de88af0162a75b9a251004a10 SHA1 b13cf9215e8b9f4a46b3437a5a7a7fa89933ae70 SHA256 12e5b288007d1e3d117b554c00b2bf565ac9ced31b08acbb3080b3bfda9a2325
-EBUILD vobject-0.4.8.ebuild 550 RMD160 723523d39e1da9cd859eb7a64d7c9b10ff0efa5d SHA1 3563d2e52497cb8a0fb4db14115098eff53e2604 SHA256 349691d1d37ac808d5eb627d9c47c5953fd4bf405a04108d37a196ecfd15b8af
+DIST vobject-0.6.0.tar.gz 52754 RMD160 9ad83b4cf4a2972a045be3cc9a8bf4e9064b6d99 SHA1 2f5f601ef0491940b225cce89e3fd482c4b04e01 SHA256 fee6f46ec3fcbec5d6be4cba52ed974613d860e3c63bde74e079ca77faf66f27
+EBUILD vobject-0.6.0.ebuild 550 RMD160 723523d39e1da9cd859eb7a64d7c9b10ff0efa5d SHA1 3563d2e52497cb8a0fb4db14115098eff53e2604 SHA256 349691d1d37ac808d5eb627d9c47c5953fd4bf405a04108d37a196ecfd15b8af
diff --git a/dev-python/vobject/vobject-0.4.8.ebuild b/dev-python/vobject/vobject-0.6.0.ebuild
index 44473b4..44473b4 100644
--- a/dev-python/vobject/vobject-0.4.8.ebuild
+++ b/dev-python/vobject/vobject-0.6.0.ebuild