[gentoo-commits] dev/dev-zero:master commit in: x11-libs/elementary/files/, x11-libs/elementary/

[Tiziano Müller]

commit:     eeddd4df29a099142067503c7566dbcdd808f517
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Sun Nov 27 20:52:10 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 20:52:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=eeddd4df

Version bump, including patches from upstream to fix building without hal.

---
 x11-libs/elementary/Manifest                       |    6 +-
 ....49898.ebuild => elementary-0.7.0.55225.ebuild} |   33 +++++++----
 .../files/0.7.0.55225-disable-svnrevision.patch    |   13 ++++
 .../files/0.7.0.55225-remove-hal-dep.patch         |   60 ++++++++++++++++++++
 4 files changed, 97 insertions(+), 15 deletions(-)

diff --git a/x11-libs/elementary/Manifest b/x11-libs/elementary/Manifest
index 0fa4a98..be7898d 100644
--- a/x11-libs/elementary/Manifest
+++ b/x11-libs/elementary/Manifest
@@ -1,2 +1,4 @@
-EBUILD elementary-0.7.0.49898.ebuild 1549 RMD160 d75be138bdc34785c64dd331e1741f515b7d127c SHA1 edb0e5ed805be471d52f077d08ded59a6be52053 SHA256 3d805922dd05cb173fab1654c3c3700b83085fb954d9765a5daa342c38d5c931
-DIST elementary-0.7.0.49898.tar.bz2 2772443 RMD160 4012af570771797a549c6efb6fca5fae85f77a7f SHA1 383b66b38072e8681fda43574d430565b38cecbe SHA256 6b943f4a75f0014a9136317411564b672c6f5cb8936614f09e4471c050102905
+AUX 0.7.0.55225-disable-svnrevision.patch 618 RMD160 f368f1a02b9e4b68b8c0dfea7e3ccadc941a8667 SHA1 09e769da4fa7873e226cda10c64e7080f1533848 SHA256 cef88c718d479278101ccba2e6bc0d135a855adf72c777cebf552d265497f291
+AUX 0.7.0.55225-remove-hal-dep.patch 1765 RMD160 7d306f0b9330d3958e62a9749a8fd4744373b544 SHA1 d26181b90d562cc9a6a04fc5b2b9c28642b12076 SHA256 7b5a22526b3c4bfff611a748c05cca4d122ef44ac4ccff869e4164e94711e3f9
+DIST elementary-0.7.0.55225.tar.bz2 3412693 RMD160 8dd30e9791941299f58c0bd1cfd1d8d592cc37f3 SHA1 bde5f743edd971974e0cbd0cf8adc4515b762ebb SHA256 c5d330d47181fd7dea2d22e9f6b1aefbcdad981e4c8891ac49f704c0160768f8
+EBUILD elementary-0.7.0.55225.ebuild 1567 RMD160 8d2d3874b0b06873340a330ada45348f7d95e5d4 SHA1 1aa6ab93fd15410c60bc8a4abb5b732dd3b998d0 SHA256 771f606a487363e4d83967dfa82d54ad4a5df67085194d870949f12f3e219fff

diff --git a/x11-libs/elementary/elementary-0.7.0.49898.ebuild b/x11-libs/elementary/elementary-0.7.0.55225.ebuild
similarity index 69%
rename from x11-libs/elementary/elementary-0.7.0.49898.ebuild
rename to x11-libs/elementary/elementary-0.7.0.55225.ebuild
index c96985d..392864b 100644
--- a/x11-libs/elementary/elementary-0.7.0.49898.ebuild
+++ b/x11-libs/elementary/elementary-0.7.0.55225.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2010 Tiziano Müller
+# Copyright 1999-2011 Tiziano Müller
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
+
+inherit autotools eutils
 
 DESCRIPTION="Enlightenment basic widget set that is easy to use based on EFL for mobile touch-screen devices."
 HOMEPAGE="http://www.enlightenment.org/"
-SRC_URI="http://download.enlightenment.org/snapshots/2010-06-27/${P}.tar.bz2"
+SRC_URI="http://download.enlightenment.org/snapshots/2010-12-03/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -14,18 +16,25 @@ KEYWORDS="~amd64"
 IUSE="doc dbus fbcon freedesktop sdl static-libs X"
 
 RDEPEND="dev-libs/eina:0
-	>=dev-libs/eet-1.1.0
-	>=x11-libs/evas-0.9.9.063
-	>=x11-libs/ecore-0.9.9.063[fbcon?,sdl?,X?]
-	>=media-libs/edje-0.9.93.063
-	dbus? ( >=dev-libs/e_dbus-0.5.0.063[hal] )
-	freedesktop? ( >=x11-libs/efreet-0.5.0.063 )"
+	>=dev-libs/eet-1.4.1
+	>=media-libs/evas-1.0.1
+	>=dev-libs/ecore-1.0.1[fbcon?,sdl?,X?]
+	>=media-libs/edje-1.0.1
+	dbus? ( >=dev-libs/e_dbus-1.0.1 )
+	freedesktop? ( >=dev-libs/efreet-1.0.1 )"
 DEPEND="${RDEPEND}
 	sys-devel/libtool
 	dev-util/pkgconfig
 	virtual/libintl
 	doc? ( app-doc/doxygen )"
 
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PV}-remove-hal-dep.patch" \
+		"${FILESDIR}/${PV}-disable-svnrevision.patch"
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
@@ -44,18 +53,16 @@ src_compile() {
 	default
 
 	if use doc ; then
-		emake doc || die "building docs failed"
+		emake doc
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	find "${D}"/usr/lib*/elementary/modules -iname "*.la" -delete || die "deleting la files failed"
 	use static-libs || rm "${D}"/usr/lib*/*.la
 
-	dodoc AUTHORS ChangeLog NEWS README
-
 	if use doc ; then
 		dohtml -r doc/html/*
 		doman doc/man/man*/*

diff --git a/x11-libs/elementary/files/0.7.0.55225-disable-svnrevision.patch b/x11-libs/elementary/files/0.7.0.55225-disable-svnrevision.patch
new file mode 100644
index 0000000..98bf08b
--- /dev/null
+++ b/x11-libs/elementary/files/0.7.0.55225-disable-svnrevision.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index b0e1005..9bd37f6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ m4_define([v_maj], [0])
+ m4_define([v_min], [7])
+ m4_define([v_mic], [0])
+-m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
++m4_define([v_rev], [55225])
+ m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
+ ##--   When released, remove the dnl on the below line
+ dnl m4_undefine([v_rev])

diff --git a/x11-libs/elementary/files/0.7.0.55225-remove-hal-dep.patch b/x11-libs/elementary/files/0.7.0.55225-remove-hal-dep.patch
new file mode 100644
index 0000000..800dc98
--- /dev/null
+++ b/x11-libs/elementary/files/0.7.0.55225-remove-hal-dep.patch
@@ -0,0 +1,60 @@
+Index: src/lib/elm_main.c
+===================================================================
+--- src/lib/elm_main.c	(Revision 55960)
++++ src/lib/elm_main.c	(Revision 55961)
+@@ -374,7 +374,6 @@
+ #ifdef ELM_EDBUS
+    if (_elm_need_e_dbus++) return EINA_TRUE;
+    e_dbus_init();
+-   e_hal_init();
+    return EINA_TRUE;
+ #else
+    return EINA_FALSE;
+@@ -388,7 +387,6 @@
+    if (--_elm_need_e_dbus) return;
+ 
+    _elm_need_e_dbus = 0;
+-   e_hal_shutdown();
+    e_dbus_shutdown();
+ #endif
+ }
+Index: src/lib/Elementary.h.in
+===================================================================
+--- src/lib/Elementary.h.in	(Revision 55960)
++++ src/lib/Elementary.h.in	(Revision 55961)
+@@ -75,7 +75,6 @@
+ 
+ #ifdef ELM_EDBUS
+ # include <E_DBus.h>
+-# include <E_Hal.h>
+ #endif
+ 
+ #ifdef ELM_EFREET
+Index: configure.ac
+===================================================================
+--- configure.ac	(Revision 55960)
++++ configure.ac	(Revision 55961)
+@@ -330,13 +330,12 @@
+     PKG_CHECK_MODULES([ELEMENTARY_EDBUS],
+        [
+         edbus >= 1.0.0
+-        ehal >= 1.0.0
+        ],
+        [
+         AC_DEFINE(HAVE_ELEMENTARY_EDBUS, 1, [EDBus support for Elementary])
+         have_elementary_edbus="yes"
+         ELM_EDBUS_DEF="#define"
+-        requirement_elm="ehal >= 1.0.0 edbus >= 1.0.0 ${requirement_elm}"
++        requirement_elm="edbus >= 1.0.0 ${requirement_elm}"
+        ],
+        [have_elementary_edbus="no"]
+     )
+@@ -344,7 +343,7 @@
+     have_elementary_edbus="no"
+ fi
+ if test "x$want_elementary_edbus" = "xyes" -a "x$have_elementary_edbus" = "xno"; then
+-    AC_MSG_ERROR([E_DBus support requested, but no edbus/ehal found by pkg-config.])
++    AC_MSG_ERROR([E_DBus support requested, but no e_dbus found by pkg-config.])
+ fi
+ AC_SUBST(ELM_EDBUS_DEF)
+