gnome-extra/gnome-activity-journal: Add compatibility patch for libzg-0.9, https://code.launchpad.net/~manishsinha/gnome-activity-journal/fixes-924988

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 100 insertions, 7 deletions

diff --git a/gnome-extra/gnome-activity-journal/ChangeLog b/gnome-extra/gnome-activity-journal/ChangeLog
index 06e06ed74595..022cf4fdd02a 100644
--- a/gnome-extra/gnome-activity-journal/ChangeLog
+++ b/gnome-extra/gnome-activity-journal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-activity-journal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-activity-journal/ChangeLog,v 1.6 2012/02/10 23:45:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-activity-journal/ChangeLog,v 1.7 2012/04/26 17:09:09 jlec Exp $
+
+*gnome-activity-journal-0.8.0-r2 (26 Apr 2012)
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org>
+  +gnome-activity-journal-0.8.0-r2.ebuild,
+  +files/gnome-activity-journal-0.8.0-zg-0.9.patch:
+  Add compatibility patch for libzg-0.9,
+  https://code.launchpad.net/~manishsinha/gnome-activity-journal/fixes-924988
 
   10 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-activity-journal-0.8.0-r1.ebuild:
diff --git a/gnome-extra/gnome-activity-journal/Manifest b/gnome-extra/gnome-activity-journal/Manifest
index 2257e2c6926a..b2ab78176f2c 100644
--- a/gnome-extra/gnome-activity-journal/Manifest
+++ b/gnome-extra/gnome-activity-journal/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX gnome-activity-journal-0.8.0-zg-0.9.patch 506 RMD160 e313d9001425558770c8192ea169abcffc1f95cc SHA1 04f38ceb848c03bdc7fab14c4849ab4c2299dc65 SHA256 d4432ef650e8155c8534482d5b836e877f48bd026c933dc523838db6cb072c44
 DIST gnome-activity-journal-0.8.0.tar.gz 334159 RMD160 6988dbb0a869c4f9c3ba63e8d2017978a5eaa79d SHA1 95bc8bf0a52f722c8c56032dfc35b75e0a7ae682 SHA256 c1be611ecfc433df038c71857c7ca80cc0f40c8943cfb6a7be91ef0022cd4f7e
 EBUILD gnome-activity-journal-0.8.0-r1.ebuild 1436 RMD160 116dac4b948ab7ef007efbe8b7b6acb694ebd417 SHA1 47e757e5aab25e3565443a0b83d6f7800a8538ea SHA256 82aa6df02682a5209a049d5d69d8c97ddaa062cc7e80e3d8ed746262d4a71001
-MISC ChangeLog 1233 RMD160 b0313f913edaa01ede65a3469e5ab31640d1c4fb SHA1 f3339c15925fa17abcbcefb7674d09916ec2cfe6 SHA256 6cdb7ed4636006cb87d8a43652e70e3fc6bfb7816dfd53ecf3ef8420f583837c
+EBUILD gnome-activity-journal-0.8.0-r2.ebuild 1520 RMD160 41d5e7f15400ca2c83068520c312e5806e329421 SHA1 af8f3482ca41f2d16a650124af70db487c35a46b SHA256 4514529dba8326b8847ef8dbc8deb6eb470ef2b19184cb53a4c399bbb55c8551
+MISC ChangeLog 1538 RMD160 6ea26a48116e00e2e3ecbd585ebe27024f4ad925 SHA1 4ddf516e833da1ce9019a3079957ec9a7422577a SHA256 76c6059a3b8ecc7cd2faf743624f73fc6fcffd043ec7001ddbb2df5da4147fec
 MISC metadata.xml 264 RMD160 09346c8d7b51a159cc279c3bc2d9725c73de9023 SHA1 6635bd0230bc99ad582ea5c4bc56b7d4b9c322df SHA256 111835d9c7135f22f0ff18a211ab791496ae7d88980d8af9594c9f298dd08d14
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk81rCsACgkQdjK8w9WeBnA/ugD/cVRvqQLHhfB9Od6pwF0clWPI
-iHOlaan4LMCeUBJFEn8A+wWn2CK2nm9IaOcsIOzoRe82zE6cEMult2zhuy74/mq7
-=jkTL
+iEYEAREKAAYFAk+ZgToACgkQgAnW8HDreRbiCwCfdV+qYaj9uOn/TBLNiFhxAslL
+qhsAnRxHSMO1B2QwP0XlVQ6T6oG/uHR0
+=yCGN
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch b/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch
new file mode 100644
index 000000000000..73e87e0b0713
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch
@@ -0,0 +1,15 @@
+--- a/src/external.py
++++ b/src/external.py
+@@ -41,7 +41,11 @@
+     _restarted = False
+ 
+     def __init__(self):
+-        self._extension = CLIENT._iface.get_extension("Log", "journal/activity")
++        if CLIENT.get_version() >= [0, 8, 99]:
++            self._extension = CLIENT._iface.get_extension("Histogram", "journal/activity")
++        else:
++            self._extension = CLIENT._iface.get_extension("Log", "journal/activity")
++
+ 
+     def _show_error(self):
+         dialog = gtk.MessageDialog(
diff --git a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r2.ebuild b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r2.ebuild
new file mode 100644
index 000000000000..ae1d3a4f9fa1
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r2.ebuild,v 1.1 2012/04/26 17:09:09 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit eutils gnome2 distutils gnome2-utils versionator
+
+DIR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Tool for easily browsing and finding files on your computer"
+HOMEPAGE="https://launchpad.net/gnome-activity-journal/"
+SRC_URI="http://launchpad.net/gnome-activity-journal/${DIR_PV}/${PV}/+download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3 LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/dbus-python
+	dev-python/libgnome-python
+	dev-python/gconf-python
+	dev-python/gst-python
+	dev-python/pycairo
+	dev-python/pygobject:2
+	dev-python/pygtk:2
+	dev-python/pyxdg
+	gnome-extra/zeitgeist
+	sys-apps/dbus"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-python/python-distutils-extra"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() { :; }
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-zg-0.9.patch
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+	python_convert_shebangs -r 2 "${D}"
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	python_mod_optimize /usr/share/gnome-activity-journal
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	python_mod_cleanup /usr/share/gnome-activity-journal
+	gnome2_pkg_postrm
+}