Version Bump, clean backport of patches against underlinking and unconditional linking, #403345

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

4 files changed, 101 insertions, 20 deletions

diff --git a/gnome-extra/synapse/ChangeLog b/gnome-extra/synapse/ChangeLog
index 55442c793e6a..894b66f1d4d8 100644
--- a/gnome-extra/synapse/ChangeLog
+++ b/gnome-extra/synapse/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/synapse
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/ChangeLog,v 1.13 2012/02/15 18:47:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/ChangeLog,v 1.14 2012/03/19 08:04:07 jlec Exp $
+
+*synapse-0.2.10 (19 Mar 2012)
+
+  19 Mar 2012; Justin Lecher <jlec@gentoo.org>
+  files/synapse-0.2.8.2-underlinking.patch,
+  files/synapse-0.2.8.2-zeitgeist.patch, +synapse-0.2.10.ebuild:
+  Version Bump, clean backport of patches against underlinking and
+  unconditional linking, #403345
 
   15 Feb 2012; Justin Lecher <jlec@gentoo.org> synapse-0.2.8.2.ebuild,
   +files/synapse-0.2.8.2-zeitgeist.patch:
diff --git a/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch b/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch
index 5073bbc38fac..dc16a09b2e2c 100644
--- a/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch
+++ b/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch
@@ -1,16 +1,12 @@
- src/ui/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
-index 3790ed2..78686ee 100644
---- a/src/ui/Makefile.am
-+++ b/src/ui/Makefile.am
-@@ -42,7 +42,7 @@ synapse_LDADD = \
+=== modified file 'src/ui/Makefile.am'
+--- src/ui/Makefile.am	2012-03-18 19:55:48 +0000
++++ src/ui/Makefile.am	2012-03-18 19:57:30 +0000
+@@ -40,6 +40,7 @@
  	$(top_builddir)/src/core/libsynapsecore.la \
  	$(top_builddir)/src/plugins/libplugins.la \
  	$(top_builddir)/src/tile-view/libtileview.la \
--	$(NULL)
-+	$(NULL) -lm
++	-lm
+ 	$(NULL)
  
  if HAVE_INDICATOR
- synapse_VALAFLAGS += --pkg appindicator-0.1 -D HAVE_INDICATOR
+
diff --git a/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch b/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
index d2ccfca58a61..22ce69928f76 100644
--- a/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
+++ b/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
@@ -1,11 +1,7 @@
- src/ui/Makefile.am |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
-index 3790ed2..c9df5a2 100644
---- a/src/ui/Makefile.am
-+++ b/src/ui/Makefile.am
-@@ -11,7 +11,6 @@ synapse_VALAFLAGS = \
+=== modified file 'src/ui/Makefile.am'
+--- src/ui/Makefile.am	2012-03-18 19:11:23 +0000
++++ src/ui/Makefile.am	2012-03-18 19:55:48 +0000
+@@ -11,7 +11,6 @@
  	--pkg gdk-x11-2.0 \
  	--pkg gio-2.0 \
  	--pkg gio-unix-2.0 \
@@ -13,3 +9,4 @@ index 3790ed2..c9df5a2 100644
  	--pkg gee-1.0 \
  	--pkg json-glib-1.0 \
  	--pkg unique-1.0 \
+
diff --git a/gnome-extra/synapse/synapse-0.2.10.ebuild b/gnome-extra/synapse/synapse-0.2.10.ebuild
new file mode 100644
index 000000000000..86137d12bede
--- /dev/null
+++ b/gnome-extra/synapse/synapse-0.2.10.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/synapse-0.2.10.ebuild,v 1.1 2012/03/19 08:04:07 jlec Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit gnome2 autotools-utils gnome2-utils
+
+DESCRIPTION="A program launcher in the style of GNOME Do"
+HOMEPAGE="http://launchpad.net/synapse-project/"
+SRC_URI="http://launchpad.net/synapse-project/0.2/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana plugins +zeitgeist"
+
+RDEPEND="
+	dev-lang/vala:0.14
+	dev-libs/dbus-glib
+	dev-libs/libgee:0
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libunique:1
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtkhotkey
+	x11-libs/gtk+:2
+	x11-libs/libnotify
+	x11-libs/pango
+	x11-themes/gnome-icon-theme
+	ayatana? ( dev-libs/libappindicator )
+	plugins? ( net-libs/rest )
+	zeitgeist? (
+		dev-libs/libzeitgeist
+		gnome-extra/zeitgeist
+		gnome-extra/zeitgeist-extensions[fts]
+		)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.8.2-underlinking.patch
+	"${FILESDIR}"/${PN}-0.2.8.2-zeitgeist.patch
+	)
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+src_prepare() {
+	sed -i -e 's/GNOME/GNOME;GTK/' data/synapse.desktop.in
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable ayatana indicator yes)
+		$(use_enable plugins librest yes)
+		$(use_enable zeitgeist)
+		VALAC="$(type -P valac-0.14)"
+		)
+	autotools-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}