replace conduit ebuilds with the ones from dev-zero, lots better

svn path=/; revision=97

6 files changed, 71 insertions, 104 deletions

diff --git a/app-admin/conduit/Manifest b/app-admin/conduit/Manifest
index 4d11f43..77a5451 100644
--- a/app-admin/conduit/Manifest
+++ b/app-admin/conduit/Manifest
@@ -1,5 +1,3 @@
-AUX conduit-0.3.9_correct_firefox_path.patch 450 RMD160 1bee9c2965dcf959a094b6e1adcea2882ada8dbf SHA1 007e05d95cbe7a29c189e1e3445d5b316b72e1ad SHA256 e89103d2747f9476586d5a4a8135c3578695a3aaa2579d53500c12e1b5c54165
-DIST conduit-0.3.13.tar.bz2 920341 RMD160 c4b5391a3629d6e85fc59a86b3ea367e2b62976a SHA1 a84beec8fe8f009cd55cd91abb92b56e85b77e4d SHA256 5fd3d3ab816d347a00dce93cdfa856339d02be878a524a4a8031d9643b52bf86
-DIST conduit-0.3.9.tar.bz2 691634 RMD160 22d1f316c34a7570297292f7d3ae9565c311eb41 SHA1 b7528d5e627ce06539f0102ad7bb99edeb64b2d7 SHA256 b2155dd3266a3f7a0f7bcd64700ca9361cfec7fcc4e7c0147dd715e4c81ebdd0
-EBUILD conduit-0.3.13.ebuild 1042 RMD160 7564c362fa6de523014fbfd87011018466789305 SHA1 adbd16fb6e0837bd2dfe82dcdc5d82cd09f7c08b SHA256 739c1399438f4af7d4659c0b0b33baf2a79c40d3a30f747cc4772295547f20e2
-EBUILD conduit-0.3.9.ebuild 1038 RMD160 f21f786775e19843bb903fd907918833a980a0bd SHA1 e92c2e85488b8b1456daee09424e2f1ba78384da SHA256 5c8b7ca00c048eefd34a74c4571fcb6d18d94aee3c6e183c1327311747872aed
+AUX 0.3.13.1-correct_firefox_path.patch 487 RMD160 4fff08ef5af4afdae3a5f70ff1a4b1c45c315d5f SHA1 f5d663299f0cd0f970e8a901c5929bae1018ce12 SHA256 1dc4b12c84e83d8d6adc48d4c2f4ab7f62704d54d083babb3bd7e2d1b2213444
+DIST conduit-0.3.13.1.tar.bz2 939130 RMD160 eefeecf164b2e452e331c176724c73eadc6c1e98 SHA1 50f85d5fcbe8985bc1639093bf6c5bdf7978ada0 SHA256 1a13d195d39b48676893f67c3b313409183f48fe7dcb4f674abb41387ccd5da5
+EBUILD conduit-0.3.13.1.ebuild 1461 RMD160 0b5f7f2a1faf0e36eabc7d5f05776c2fbe404edb SHA1 d8a2838c27bd9ead8c110d1bf275b190afc6f3da SHA256 3aac086556bfa41d5446d33a4047507db78a4d4bf76f056f4136eb24287b55bd
diff --git a/app-admin/conduit/conduit-0.3.13.1.ebuild b/app-admin/conduit/conduit-0.3.13.1.ebuild
new file mode 100644
index 0000000..c456975
--- /dev/null
+++ b/app-admin/conduit/conduit-0.3.13.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils python versionator
+
+DESCRIPTION="Synchronization for GNOME"
+HOMEPAGE="http://www.conduit-project.org"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nautilus eog"
+
+DEPEND="sys-apps/dbus
+	>=dev-python/pygoocanvas-0.9.0
+	>=dev-python/vobject-0.4.8
+	>=dev-python/pyxml-0.8.4
+	>=dev-python/pygtk-2.10.3
+	>=dev-python/pysqlite-2.3.1
+	>=dev-python/pygoocanvas-0.9.0
+	eog? ( media-gfx/eog )
+	nautilus? ( gnome-base/nautilus )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PV}-correct_firefox_path.patch"
+
+	find . -iname Makefile.in -print0 | xargs -0 sed -i -e 's|^py_compile = .*|py_compile = /usr/bin/true|g'
+}
+
+src_compile() {
+	econf \
+		$(use_enable nautilus nautilus-extension) \
+		$(use_enable eog eog-plugin)
+
+	emake py_compile=true || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/conduit/modules/
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/conduit/
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup /usr/$(get_libdir)/conduit/modules/
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/conduit/
+}
diff --git a/app-admin/conduit/conduit-0.3.13.ebuild b/app-admin/conduit/conduit-0.3.13.ebuild
deleted file mode 100644
index 7adcbc9..0000000
--- a/app-admin/conduit/conduit-0.3.13.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils gnome2 python multilib
-
-DESCRIPTION="A Desktop Synchronization Solution for GNOME"
-HOMEPAGE="http://www.conduit-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome nautilus"
-
-RDEPEND=">=virtual/python-2.5
-		>=dev-python/pygtk-2.10
-		>=dev-python/pyxml-0.8.4
-		dev-python/vobject
-		>=dev-python/dbus-python-0.80
-		>=dev-python/pygoocanvas-0.9
-		dev-python/python-dateutil
-		>=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_setup() {
-
-	G2CONF="${G2CONF} $(use_enable gnome nautilus-extension) $(use_enable gnome eog-plugin)"
-
-}
-
-#src_unpack() {
-
-#	unpack ${A}
-#	epatch ${FILESDIR}/${P}_correct_firefox_path.patch
-
-#}
diff --git a/app-admin/conduit/conduit-0.3.9.ebuild b/app-admin/conduit/conduit-0.3.9.ebuild
deleted file mode 100644
index 414b85a..0000000
--- a/app-admin/conduit/conduit-0.3.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils gnome2 python multilib
-
-DESCRIPTION="A Desktop Synchronization Solution for GNOME"
-HOMEPAGE="http://www.conduit-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome nautilus"
-
-RDEPEND=">=virtual/python-2.5
-		>=dev-python/pygtk-2.10
-		>=dev-python/pyxml-0.8.4
-		dev-python/vobject
-		>=dev-python/dbus-python-0.80
-		>=dev-python/pygoocanvas-0.9
-		dev-python/python-dateutil
-		>=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_setup() {
-
-	G2CONF="${G2CONF} $(use_enable gnome nautilus-extension) $(use_enable gnome eog-plugin)"
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-	epatch ${FILESDIR}/${P}_correct_firefox_path.patch
-
-}
diff --git a/app-admin/conduit/files/0.3.13.1-correct_firefox_path.patch b/app-admin/conduit/files/0.3.13.1-correct_firefox_path.patch
new file mode 100644
index 0000000..6b5ee19
--- /dev/null
+++ b/app-admin/conduit/files/0.3.13.1-correct_firefox_path.patch
@@ -0,0 +1,11 @@
+--- conduit-0.3.13/conduit/conduit.orig	2008-08-05 23:12:49.000000000 +0200
++++ conduit-0.3.13/conduit/conduit	2008-08-05 23:18:03.000000000 +0200
+@@ -8,7 +8,7 @@
+ # Run mozilla takes care of settin up the appropriate environment variables
+ # to run a program using mozilla libs
+ 
+-for d in `ls -d /usr/lib*/firefox* | sort -r`
++for d in `ls -d /usr/lib*/{mozilla-,}firefox* 2> /dev/null | sort -r`
+ do
+     if [ -x $d/run-mozilla.sh ]; then
+         echo INFO: FOUND FIREFOX LIBS AT $d
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
deleted file mode 100644
index d2e4cf3..0000000
--- a/app-admin/conduit/files/conduit-0.3.9_correct_firefox_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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