commit: a4a9942c06d668c5a2b14345b49de7c6896a2b37 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> AuthorDate: Sun Jan 28 13:50:10 2018 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Sun Jan 28 13:50:10 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4a9942c
gnome-extra/: remove last rited package gnome-extra/activity-log-manager/Manifest | 1 - .../activity-log-manager-0.9.7-r1.ebuild | 50 -------- .../files/activity-log-manager-0.9.0.1-gold.patch | 16 --- .../activity-log-manager-0.9.7-ambiguous.patch | 139 --------------------- .../activity-log-manager-0.9.7-gtk-icon_size.patch | 13 -- gnome-extra/activity-log-manager/metadata.xml | 17 --- gnome-extra/gnome-activity-journal/Manifest | 1 - .../gnome-activity-journal-0.8.0-zg-0.9.patch | 15 --- .../gnome-activity-journal-0.8.0-r4.ebuild | 50 -------- .../gnome-activity-journal-0.8.0-r5.ebuild | 50 -------- gnome-extra/gnome-activity-journal/metadata.xml | 11 -- gnome-extra/zeitgeist-explorer/Manifest | 1 - gnome-extra/zeitgeist-explorer/metadata.xml | 17 --- .../zeitgeist-explorer-0.2-r2.ebuild | 27 ---- gnome-extra/zeitgeist/Manifest | 2 - .../files/zeitgeist-0.9.15-python-detection.patch | 38 ------ .../files/zeitgeist-1.0-python-detection.patch | 38 ------ gnome-extra/zeitgeist/metadata.xml | 23 ---- gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild | 93 -------------- gnome-extra/zeitgeist/zeitgeist-1.0.ebuild | 94 -------------- 20 files changed, 696 deletions(-) diff --git a/gnome-extra/activity-log-manager/Manifest b/gnome-extra/activity-log-manager/Manifest deleted file mode 100644 index 647abfea293..00000000000 --- a/gnome-extra/activity-log-manager/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST activity-log-manager-0.9.7.tar.xz 332004 BLAKE2B 87abc548f111bd25e86c750b91888cf8f5b6d26c0598cb960f6b391523882475e6c285d7136372363010fcf8a10d6943f582c13b54a2993bb90fc3facf9307d0 SHA512 e0a43cae08e7f86b35ab8a4b0c70a4eb4a2ae821d3ab907a5c4135640e67c572ec2e735a3350099e3febe177d67db83af526c62b7b595894c0df08d84c3bb6ce diff --git a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild deleted file mode 100644 index 947436189f9..00000000000 --- a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -GNOME2_LA_PUNT="yes" -VALA_MIN_API_VERSION="0.26" # Fails with 0.24, but works with 0.26 and older versions -WANT_AUTOMAKE=1.13 - -inherit autotools eutils gnome2 vala versionator - -DESCRIPTION="GUI which lets you easily control what gets logged by Zeitgeist" -HOMEPAGE="https://launchpad.net/activity-log-manager/"; -SRC_URI="https://launchpad.net/history-manager/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.xz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - dev-libs/libgee:0 - dev-libs/glib:2 - gnome-extra/zeitgeist - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/pango" -DEPEND="${RDEPEND} - $(vala_depend) - virtual/pkgconfig - dev-util/intltool - sys-devel/gettext" - -src_prepare() { - DOCS="README NEWS INSTALL ChangeLog AUTHORS" - - rm src/${PN}.c || die - - epatch \ - "${FILESDIR}"/${PN}-0.9.0.1-gold.patch \ - "${FILESDIR}"/${P}-gtk-icon_size.patch \ - "${FILESDIR}"/${P}-ambiguous.patch - sed \ - -e "/^almdocdir/s:=.*$:= \${prefix}/share/doc/${PF}:g" \ - -i Makefile.am || die - vala_src_prepare - eautoreconf - gnome2_src_prepare -} diff --git a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.0.1-gold.patch b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.0.1-gold.patch deleted file mode 100644 index cffaf594feb..00000000000 --- a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.0.1-gold.patch +++ /dev/null @@ -1,16 +0,0 @@ - src/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index eaf039f..05c1393 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -50,7 +50,7 @@ SHARED_LIBS = \ - $(GEE_LIBS) \ - $(GIO_UNIX_LIBS) - activity_log_manager_LDADD = \ -- $(SHARED_LIBS) -+ $(SHARED_LIBS) -lm - libactivity_log_manager_la_LIBADD = \ - $(SHARED_LIBS) \ - $(CCPANEL_LIBS) diff --git a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch deleted file mode 100644 index ba582aef897..00000000000 --- a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch +++ /dev/null @@ -1,139 +0,0 @@ - src/blacklist-dbus.vala | 4 ++-- - src/security-widget.vala | 2 +- - src/unified-privacy-applications.vala | 16 ++++++++-------- - src/unified-privacy.vala | 4 ++-- - 4 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/src/blacklist-dbus.vala b/src/blacklist-dbus.vala -index 355a684..fd165e3 100644 ---- a/src/blacklist-dbus.vala -+++ b/src/blacklist-dbus.vala -@@ -137,7 +137,7 @@ namespace Alm { - return false; - } - -- public async void find_events (string id, TreeIter iter, ListStore store) -+ public async void find_events (string id, TreeIter iter, Gtk.ListStore store) - { - Event event = new Event(); - event.manifestation = Zeitgeist.ZG.USER_ACTIVITY; -@@ -165,7 +165,7 @@ namespace Alm { - store.set_value(iter, 5, counter); - } - -- public void get_count_for_app (string app_id, TreeIter iter, ListStore store) { -+ public void get_count_for_app (string app_id, TreeIter iter, Gtk.ListStore store) { - find_events(app_id, iter, store); - } - -diff --git a/src/security-widget.vala b/src/security-widget.vala -index 4394924..e983c15 100644 ---- a/src/security-widget.vala -+++ b/src/security-widget.vala -@@ -39,7 +39,7 @@ namespace Alm { - - private void set_up_ui () { - -- var liststore_delay = new ListStore (2, typeof (string), typeof (int)); -+ var liststore_delay = new Gtk.ListStore (2, typeof (string), typeof (int)); - TreeIter iter; - liststore_delay.append (out iter); - liststore_delay.set (iter, 0, "1 second", 1, 0); -diff --git a/src/unified-privacy-applications.vala b/src/unified-privacy-applications.vala -index 9b06f44..a4966d3 100644 ---- a/src/unified-privacy-applications.vala -+++ b/src/unified-privacy-applications.vala -@@ -60,7 +60,7 @@ namespace Alm { - } - } - -- public void get_count_for_app(string id, TreeIter iter, ListStore store) { -+ public void get_count_for_app(string id, TreeIter iter, Gtk.ListStore store) { - this.blacklist_interface.get_count_for_app(id, iter, store); - } - -@@ -131,7 +131,7 @@ namespace Alm { - private class ApplicationsTreeView : Gtk.Box { - - private ApplicationBlacklist app_blacklist; -- private ListStore store; -+ private Gtk.ListStore store; - private TreeView treeview; - - HashTable<string, AppChooseInfo> blocked_apps; -@@ -145,7 +145,7 @@ namespace Alm { - N_COLS - } - -- public ListStore liststore { -+ public Gtk.ListStore liststore { - get { - return this.store; - } -@@ -160,7 +160,7 @@ namespace Alm { - this.blocked_apps = blocked; - this.unblocked_apps = unblocked; - -- this.store = new ListStore (TreeViewCols.N_COLS, -+ this.store = new Gtk.ListStore (TreeViewCols.N_COLS, - typeof (string), - typeof (Gdk.Pixbuf), - typeof (string)); -@@ -292,7 +292,7 @@ namespace Alm { - private class AppSelectionTreeView : Gtk.Box { - - private ApplicationBlacklist app_blacklist; -- private ListStore store; -+ private Gtk.ListStore store; - private TreeView treeview; - - enum TreeViewCols -@@ -312,7 +312,7 @@ namespace Alm { - } - } - -- public ListStore liststore { -+ public Gtk.ListStore liststore { - get { - return store; - } -@@ -323,7 +323,7 @@ namespace Alm { - - this.app_blacklist = app_blacklist; - -- this.store = new ListStore (TreeViewCols.N_COLS, -+ this.store = new Gtk.ListStore (TreeViewCols.N_COLS, - typeof (string), - typeof (Gdk.Pixbuf), - typeof (string), -@@ -426,7 +426,7 @@ namespace Alm { - } - } - -- public ListStore liststore { -+ public Gtk.ListStore liststore { - get { - return treeview.liststore; - } -diff --git a/src/unified-privacy.vala b/src/unified-privacy.vala -index 0d46370..c64f78d 100644 ---- a/src/unified-privacy.vala -+++ b/src/unified-privacy.vala -@@ -55,7 +55,7 @@ namespace Alm { - - //General stuffs - private TreeView exception_list; -- private ListStore exception_list_store; -+ private Gtk.ListStore exception_list_store; - - private Switch record_button; - -@@ -262,7 +262,7 @@ namespace Alm { - exception_vbox.pack_start (al2, false, false, 5); - - // Exception TreeView -- this.exception_list_store = new ListStore (4, -+ this.exception_list_store = new Gtk.ListStore (4, - typeof(string), // Full file path of application desktop file. - typeof(Gdk.Pixbuf?), // Pixbuf - typeof(string), // File basename or ApplicationName diff --git a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-gtk-icon_size.patch b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-gtk-icon_size.patch deleted file mode 100644 index 07e082e269d..00000000000 --- a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-gtk-icon_size.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'src/unified-privacy.vala' ---- src/unified-privacy.vala 2014-11-10 06:31:32 +0000 -+++ src/unified-privacy.vala 2014-11-10 19:34:43 +0000 -@@ -289,7 +289,7 @@ - // Add/Remove buttons - var exception_toolbar = new Toolbar(); - exception_toolbar.toolbar_style = ToolbarStyle.ICONS; -- exception_toolbar.icon_size = 1; -+ exception_toolbar.icon_size = Gtk.IconSize.MENU; - exception_toolbar.icon_size_set = true; - exception_toolbar.visible = true; - - diff --git a/gnome-extra/activity-log-manager/metadata.xml b/gnome-extra/activity-log-manager/metadata.xml deleted file mode 100644 index b7f02104329..00000000000 --- a/gnome-extra/activity-log-manager/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <longdescription> -Gnome Activity Journal (GAJ for friends) is your portal to the world of -Zeitgeist. It's a user interface written in PyGTK ideated for easily -browsing and finding files on your computer. It incorporates search, -file preview, tag, bookmark and other useful features. -</longdescription> - <upstream> - <remote-id type="launchpad">history-manager</remote-id> - </upstream> -</pkgmetadata> diff --git a/gnome-extra/gnome-activity-journal/Manifest b/gnome-extra/gnome-activity-journal/Manifest deleted file mode 100644 index c83297ed4b2..00000000000 --- a/gnome-extra/gnome-activity-journal/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-activity-journal-0.8.0.tar.gz 334159 BLAKE2B 493e3db1931469613cdae8651669885abe78f0fb4e322eb8adb359cb16609f99d6ca3caac1c32435bdb7bae107bd91c0c88c8dabbfa96e182c5546ed992cf368 SHA512 5d92bb032328c9eb7c230015675c379b9cb9f3c31362128b8b25ede070df11120beadbf1766ba5d250006f1da523fc8a45f760119706a977de6e0124321375a7 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 deleted file mode 100644 index 73e87e0b071..00000000000 --- a/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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-r4.ebuild b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild deleted file mode 100644 index ddad2fd9208..00000000000 --- a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_IN_SOURCE_BUILD=true - -inherit eutils gnome2 distutils-r1 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="https://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:0.10 - 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" - -PATCHES=( "${FILESDIR}"/${P}-zg-0.9.patch ) - -src_configure() { - distutils-r1_src_configure -} - -src_compile() { - distutils-r1_src_compile -} - -src_install() { - distutils-r1_src_install - python_replicate_script "${ED}"/usr/bin/${PN} -} diff --git a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild deleted file mode 100644 index a06e51dc4aa..00000000000 --- a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_IN_SOURCE_BUILD=true -DISTUTILS_SINGLE_IMPL=true - -inherit eutils gnome2 distutils-r1 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="https://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:0.10 - 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" - -PATCHES=( "${FILESDIR}"/${P}-zg-0.9.patch ) - -src_configure() { - distutils-r1_src_configure -} - -src_compile() { - distutils-r1_src_compile -} - -src_install() { - distutils-r1_src_install - python_fix_shebang "${ED}" -} diff --git a/gnome-extra/gnome-activity-journal/metadata.xml b/gnome-extra/gnome-activity-journal/metadata.xml deleted file mode 100644 index c15f403d032..00000000000 --- a/gnome-extra/gnome-activity-journal/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <upstream> - <remote-id type="launchpad">gnome-activity-journal</remote-id> - </upstream> -</pkgmetadata> diff --git a/gnome-extra/zeitgeist-explorer/Manifest b/gnome-extra/zeitgeist-explorer/Manifest deleted file mode 100644 index 4cc045e8602..00000000000 --- a/gnome-extra/zeitgeist-explorer/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST zeitgeist-explorer-0.2.tar.gz 25503 BLAKE2B 014aaafccfa97c39288454d8051efe564553f4b9df8edc71de51b55081e8c16ec60772ec41c78d9249010d15e4d672a93e8526e23a41c57d33ae22bef2231224 SHA512 05e16e4c6980ce0dd23fb3f74d0c45aad6e5a31d5b8982d04d20781c3527e4e1b768e75e67664fe5731202a3682c972fd759a71d58b420b31f72e3eb2dce7788 diff --git a/gnome-extra/zeitgeist-explorer/metadata.xml b/gnome-extra/zeitgeist-explorer/metadata.xml deleted file mode 100644 index d7b6f196245..00000000000 --- a/gnome-extra/zeitgeist-explorer/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <longdescription> -Zeitgeist explorer is a tool which can be used to monitor and explore the -events logged by zeitgeist. In the monitor mode is can show the events logged -in real-time just like wireshark. In explore mode, it can fetch already -logged events for a specific template -</longdescription> - <upstream> - <remote-id type="launchpad">zeitgeist-explorer</remote-id> - </upstream> -</pkgmetadata> diff --git a/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r2.ebuild b/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r2.ebuild deleted file mode 100644 index d69e9e8586c..00000000000 --- a/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# gnome-extra/zeitgeist doesn't have python3 support, bug #622084 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 versionator - -MY_PV="$(get_version_component_range 1-2)" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Monitor and inspect Zeitgeist's log at a low level - developer tool" -HOMEPAGE="https://launchpad.net/zeitgeist-explorer/"; -SRC_URI="https://launchpad.net/${PN}/0.x/${MY_PV}/+download/${P}.tar.gz"; - -SLOT="0" -LICENSE="LGPL-2.1" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - gnome-extra/zeitgeist[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection]" -DEPEND="${RDEPEND} - dev-python/python-distutils-extra[${PYTHON_USEDEP}]" diff --git a/gnome-extra/zeitgeist/Manifest b/gnome-extra/zeitgeist/Manifest deleted file mode 100644 index 924503049e3..00000000000 --- a/gnome-extra/zeitgeist/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST zeitgeist-0.9.16.tar.xz 807092 BLAKE2B c74f2c5d9dd4dcfb57714d2a43acfe8b0abf3f97913eff92dd6d4c5ace43b60db0bbd3531fa423635ef65bb7d6fbdff7eeabccf8bba8408c82561513493d4c44 SHA512 eb28215c937b71c8cec12f55236db4281ad529b2854ecb3c093477d45cd8348c6ea764e2cf00a99d41645b27b685a5325f0631b318409735b578a5871087b0f1 -DIST zeitgeist-1.0.tar.xz 848740 BLAKE2B 7ded951d00ed05f539359ab5d2f54afbbed3f1a1b6e62fe588d2307cdb97f60227efa0aa9d4159c3738f4eb641e6d63665b665b4a8313449f92cdcc6cee9efaf SHA512 e8fa4db7202c5dceb6cb960775651624bdcd7fc2005019ff6491d7c139ccf036e865977adbd98ae3c9b97b22e5cf28534b64f01fde58b7bc89c0f0f8d13383e8 diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-python-detection.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-python-detection.patch deleted file mode 100644 index 79184f70a2b..00000000000 --- a/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-python-detection.patch +++ /dev/null @@ -1,38 +0,0 @@ -From dd46d6f8db69ee8d291d63251d841e73070cd526 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 4 Jan 2015 00:09:14 +0100 -Subject: [PATCH] Make python module detection match detected python - -Some distribution might provided multiple python and configure can know -about which exactly though AM_PATH_PYTHON. ---- - configure.ac | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index acf7daa..6136ad6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -269,13 +269,14 @@ if test "x$HAVE_RAPPER" = "xno"; then - fi - - # check for python-rdflib -+AM_PATH_PYTHON([2.7]) -+ - AC_MSG_CHECKING([for python-rdflib]) --echo "import rdflib" | python - 2>/dev/null --if test $? -ne 0 ; then -- AC_MSG_FAILURE([failed. Please install the python-rdflib package.]) --else -+AS_IF([$PYTHON -c "import rdflib" 2>/dev/null], [ - AC_MSG_RESULT([yes]) --fi -+], [ -+ AC_MSG_FAILURE([failed. Please install the python-rdflib package.]) -+]) - - ################################################# - # Summary --- -2.3.0 - diff --git a/gnome-extra/zeitgeist/files/zeitgeist-1.0-python-detection.patch b/gnome-extra/zeitgeist/files/zeitgeist-1.0-python-detection.patch deleted file mode 100644 index c82db10ec3c..00000000000 --- a/gnome-extra/zeitgeist/files/zeitgeist-1.0-python-detection.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 662d359689834ea3d1fdb75050b4c97d2ad720cf Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 4 Jan 2015 00:09:14 +0100 -Subject: [PATCH] Make python module detection match detected python - -Some distribution might provided multiple python and configure can know -about which exactly though AM_PATH_PYTHON. ---- - configure.ac | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9a0330a6..703fb957 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -255,13 +255,14 @@ if test "x$HAVE_RAPPER" = "xno"; then - fi - - # check for python-rdflib -+AM_PATH_PYTHON([2.7]) -+ - AC_MSG_CHECKING([for python-rdflib]) --echo "import rdflib" | $PYTHON - 2>/dev/null --if test $? -ne 0 ; then -- AC_MSG_FAILURE([failed. Please install the python-rdflib package.]) --else -+AS_IF([$PYTHON -c "import rdflib" 2>/dev/null], [ - AC_MSG_RESULT([yes]) --fi -+], [ -+ AC_MSG_FAILURE([failed. Please install the python-rdflib package.]) -+]) - - ################################################# - # Summary --- -2.13.2 - diff --git a/gnome-extra/zeitgeist/metadata.xml b/gnome-extra/zeitgeist/metadata.xml deleted file mode 100644 index 9253594b1e4..00000000000 --- a/gnome-extra/zeitgeist/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <longdescription> -The engine is the main module that accepts all incoming events and allows -applications to fetch as well as subscribe to be notified when events -are logged. It is the heart of Zeitgeist. -</longdescription> - <use> - <flag name="datahub">Use build datahub for passive event injection</flag> - <flag name="downloads-monitor">Monitor the XDG_DOWNLOAD_DIRECTORY</flag> - <flag name="fts">Enable the full text search extension</flag> - <flag name="sql-debug">Enable SQL debugging</flag> - <flag name="telepathy">Enable telepathy framework as data source</flag> - </use> - <upstream> - <remote-id type="launchpad">zeitgeist</remote-id> - </upstream> -</pkgmetadata> diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild deleted file mode 100644 index 32e9f593157..00000000000 --- a/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=true -PYTHON_COMPAT=( python2_7 ) -VALA_MIN_API_VERSION=0.22 - -inherit autotools-utils bash-completion-r1 eutils python-r1 vala versionator - -DIR_PV=$(get_version_component_range 1-2) - -DESCRIPTION="Service to log activities and present to other apps" -HOMEPAGE="https://launchpad.net/zeitgeist/"; -SRC_URI="https://launchpad.net/zeitgeist/${DIR_PV}/${PV}/+download/${P}.tar.xz - https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"; - -LICENSE="LGPL-2+ LGPL-3+ GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="+datahub downloads-monitor +fts icu introspection nls sql-debug telepathy" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - downloads-monitor? ( datahub )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/json-glib - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/rdflib[${PYTHON_USEDEP}] - media-libs/raptor:2 - >=dev-libs/glib-2.35.4:2 - >=dev-db/sqlite-3.7.11:3 - sys-apps/dbus - datahub? ( x11-libs/gtk+:3 ) - fts? ( dev-libs/xapian:0=[inmemory] ) - icu? ( dev-libs/dee[icu?] ) - introspection? ( dev-libs/gobject-introspection ) - telepathy? ( net-libs/telepathy-glib ) -" -DEPEND="${RDEPEND} - $(vala_depend) - >=dev-util/intltool-0.35 - virtual/pkgconfig -" - -src_prepare() { - # pure-python module is better managed manually, see src_install - sed -e 's:python::g' \ - -i Makefile.am || die - - # Fix direct invocation of python in configure - epatch "${FILESDIR}"/${PN}-0.9.15-python-detection.patch - - autotools-utils_src_prepare - vala_src_prepare -} - -src_configure() { - local myeconfargs=( - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --with-session-bus-services-dir="${EPREFIX}/usr/share/dbus-1/services" - $(use_enable sql-debug explain-queries) - $(use_enable datahub) - $(use_enable downloads-monitor) - $(use_enable telepathy) - $(use_enable introspection) - $(use_with icu dee-icu) - ) - - use nls || myeconfargs+=( --disable-nls ) - use fts && myeconfargs+=( --enable-fts ) - - python_setup - autotools-utils_src_configure -} - -src_test() { - autotools-utils_src_test TESTS_ENVIRONMENT="dbus-run-session" -} - -src_install() { - dobashcomp data/completions/zeitgeist-daemon - autotools-utils_src_install - cd python || die - python_moduleinto ${PN} - python_foreach_impl python_domodule *py - - # Redundant NEWS/AUTHOR installation - rm -r "${D}"/usr/share/zeitgeist/doc/ || die -} diff --git a/gnome-extra/zeitgeist/zeitgeist-1.0.ebuild b/gnome-extra/zeitgeist/zeitgeist-1.0.ebuild deleted file mode 100644 index 7cc47aea59c..00000000000 --- a/gnome-extra/zeitgeist/zeitgeist-1.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -VALA_MIN_API_VERSION=0.22 - -inherit bash-completion-r1 python-r1 vala versionator xdg - -DIR_PV=$(get_version_component_range 1-2) - -DESCRIPTION="Service to log activities and present to other apps" -HOMEPAGE="https://launchpad.net/zeitgeist/"; -SRC_URI="https://launchpad.net/zeitgeist/${DIR_PV}/${PV}/+download/${P}.tar.xz - https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"; - -LICENSE="LGPL-2+ LGPL-3+ GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="+datahub downloads-monitor +fts introspection nls sql-debug telepathy" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - downloads-monitor? ( datahub )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/json-glib - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/rdflib[${PYTHON_USEDEP}] - media-libs/raptor:2 - >=dev-libs/glib-2.35.4:2 - >=dev-db/sqlite-3.7.11:3 - sys-apps/dbus - datahub? ( x11-libs/gtk+:3 ) - fts? ( dev-libs/xapian:0=[inmemory] ) - introspection? ( dev-libs/gobject-introspection ) - telepathy? ( net-libs/telepathy-glib ) -" -DEPEND="${RDEPEND} - $(vala_depend) - >=sys-devel/gettext-0.19 - virtual/pkgconfig -" - -PATCHES=( - # Fix direct invocation of python in configure - "${FILESDIR}"/${PN}-1.0-python-detection.patch -) - -src_prepare() { - # pure-python module is better managed manually, see src_install - sed -e 's:python::g' \ - -i Makefile.am || die - - vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local myeconfargs=( - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --without-dee-icu - $(use_enable sql-debug explain-queries) - $(use_enable datahub) - $(use_enable downloads-monitor) - $(use_enable telepathy) - $(use_enable introspection) - ) - - use nls || myeconfargs+=( --disable-nls ) - use fts && myeconfargs+=( --enable-fts ) - - python_setup - econf "${myeconfargs[@]}" -} - -src_test() { - emake check TESTS_ENVIRONMENT="dbus-run-session" -} - -src_install() { - default - - dobashcomp data/completions/zeitgeist-daemon - - cd python || die - python_moduleinto ${PN} - python_foreach_impl python_domodule *py - - # Redundant NEWS/AUTHOR installation - rm -r "${D}"/usr/share/zeitgeist/doc/ || die -}
