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

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

5 files changed, 109 insertions, 26 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/Manifest b/gnome-extra/synapse/Manifest
index d9e69afb4412..9d63c9baf8fc 100644
--- a/gnome-extra/synapse/Manifest
+++ b/gnome-extra/synapse/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX synapse-0.2.8.2-underlinking.patch 500 RMD160 3ecc6f9930380ff9c5ddfa3543cca5190c212bd9 SHA1 a34f0137e37393cbb644c0397c9cd31d392a3b66 SHA256 c3fb265de9f640800165626045acf7b261f9b03c35e3244a0b1126c19b96411e
-AUX synapse-0.2.8.2-zeitgeist.patch 403 RMD160 b7eed120ae9db74642240a6ed56f77bfe5347223 SHA1 6e504cb39c9e62ea2787a1a0f2c7307c7de072a2 SHA256 b8be4e98e68cd50b92420a082c9288163db69a05dc33b44a7340bef6d75d1643
+AUX synapse-0.2.8.2-underlinking.patch 335 RMD160 84dbcbafef65a93a8233bf6116ba0c55312b6177 SHA1 c0e9c34e3f9f9d790ac23c804b1933799a86d02d SHA256 671190afef5a5362707379055d35c7a36df7d811a105bf9300fe5d3c3cca450c
+AUX synapse-0.2.8.2-zeitgeist.patch 306 RMD160 12138e82ee59fa1744f5d37a81ba48380821405f SHA1 6604de9eb847a06076842d300d8d41eea0597e6e SHA256 82d5eda75bdc41e6f819339a4b93bb9d0477a87a3306aefc77f221d559e58215
+DIST synapse-0.2.10.tar.gz 625327 RMD160 a60f7a372e7de5eaae57e30e8573d3e787573598 SHA1 6e8a800bdbdded4e167734c8e49d95a9e44998ff SHA256 d94f724be51f20e2085ead203495d398c5fece24071ffed7e805108be2219540
 DIST synapse-0.2.4.tar.gz 882201 RMD160 966bfe4e79e9b30a3dcf503b34ff30eebeb874e4 SHA1 a48466f8f14a7e3c4b588db1313972dd14f22c2e SHA256 55cf2c2c27404d6cbc72a658dff7c7ee90412033778dcc7d9c5713a175c4b93f
 DIST synapse-0.2.6.tar.gz 550501 RMD160 0a8e6c33a1265e3af53de31311fd39ad9a326936 SHA1 a503276579e73945ab59d8f4c2e42a1916e5fcaf SHA256 3af33207a559c6ce34a51f89e964da5aad6170bf3c5193d4aa0d78e874ee3ab1
 DIST synapse-0.2.8.2.tar.gz 613741 RMD160 3685a4d284df21131e08f3beb79e244c9ba26887 SHA1 3d3f6329f8da1c9e787771844e7aa3d5a3fd5f02 SHA256 3a3d77fdbe15db85fd0589fff916f65bd67f8e2c33c74b5862dc6a71c720b92d
+EBUILD synapse-0.2.10.ebuild 1667 RMD160 bc349f72a625c2682535059d6d49ab99c244417b SHA1 33e24821aa8d706ca9ff73e32b425fa64f5c5a7a SHA256 d6aca4908ec25da481741afd95644acc5078e0e7aeb8d9142285c67bf585af95
 EBUILD synapse-0.2.4.ebuild 1154 RMD160 76facae7a3f3bc66525cb6861b0fe290a0ffe3b8 SHA1 d023e5af2837e35372600f029bd0d6bf5f36c6b8 SHA256 ca90472c88861ba2b45a49b3ba17beee964bbecdf1adb7194063158ea94a3e86
 EBUILD synapse-0.2.6.ebuild 1154 RMD160 bf84ec6dfa56dc87fb6ca49edbb738dff7b08c35 SHA1 65bd1a291330b0f086b96b0b5eadaee41c5ee136 SHA256 7296f1d391fa04e4b44ddff4e1a4b6696a65ac0ac797f06772f417b8eac7211b
 EBUILD synapse-0.2.8.2.ebuild 1650 RMD160 2cbe17c5e358bde0d3bd81f2af17edd57b91651b SHA1 7eeef64aae85a70f5f7f4e6cc852564b01c470b3 SHA256 0b975e647f631111c2829326b70d6f9757cf3196ea288ba2230a52971cbc7a76
-MISC ChangeLog 2201 RMD160 ac01ea63ef22137bc930a81f1499bb03d7ede62b SHA1 ebe6fef5324f7e03fdcdb1ce09e2ee7909eefafa SHA256 22c3f524d5e7eb476adba17e172a9ae4f8d2d75ec7c42227884083086249f52a
+MISC ChangeLog 2489 RMD160 2313aa00c12943b4e7d9e981755c61dc0df529bd SHA1 106bb372be3a4804dae99b9375f089ea254bf822 SHA256 e4e08bdf57eed6c82e27b8f7d3e51eb5cf7c29307ddd84e57beb08a7cbbc5707
 MISC metadata.xml 393 RMD160 3b18c20c1097db6a8006a4150faeea12a525a658 SHA1 8d7a0407b7941f88ebcc48060b0c8437d14b2202 SHA256 b8bc88473e1d462a9eaf90e9aa912107be00501b1919bb5d0382b6d8690e2e8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk87/eMACgkQgAnW8HDreRZiTACgnGZkHy68w7+ahRkA99/hKiop
-YSsAn2F5b/orX238xVFEwmsblwjtegMD
-=bD14
+iEYEAREKAAYFAk9m6HkACgkQgAnW8HDreRZW8QCgz1TZejLm0Arw66YxH6pkyori
+QmwAnjGbd4ekp7+ARRq3u9X3tzeO9o6S
+=Khfq
 -----END PGP SIGNATURE-----
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
+}