Add underlinking patch, moved to autotools-utils.eclass

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

4 files changed, 40 insertions, 10 deletions

diff --git a/gnome-extra/synapse/ChangeLog b/gnome-extra/synapse/ChangeLog
index 67bb2017edce..695b8a3b1c3c 100644
--- a/gnome-extra/synapse/ChangeLog
+++ b/gnome-extra/synapse/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2012/01/29 16:45:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/ChangeLog,v 1.9 2012/01/29 18:30:53 jlec Exp $
+
+  29 Jan 2012; Justin Lecher <jlec@gentoo.org> synapse-0.2.8.2.ebuild,
+  +files/synapse-0.2.8.2-underlinking.patch:
+  Add underlinking patch, moved to autotools-utils.eclass
 
 *synapse-0.2.8.2 (29 Jan 2012)
 
diff --git a/gnome-extra/synapse/Manifest b/gnome-extra/synapse/Manifest
index b555961621f3..55d8eb1e4063 100644
--- a/gnome-extra/synapse/Manifest
+++ b/gnome-extra/synapse/Manifest
@@ -1,8 +1,9 @@
+AUX synapse-0.2.8.2-underlinking.patch 500 RMD160 3ecc6f9930380ff9c5ddfa3543cca5190c212bd9 SHA1 a34f0137e37393cbb644c0397c9cd31d392a3b66 SHA256 c3fb265de9f640800165626045acf7b261f9b03c35e3244a0b1126c19b96411e
 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.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 1405 RMD160 8f3b74bcd14c4a6a1618243cdd0926c7e0b9a643 SHA1 c2f7c9cbfd320b5fc9860c4508083d5b46c7aa06 SHA256 58f4a714b05fbfc90272365e41e220d54c603f9ac7802f15ac0bd9a934f2be20
-MISC ChangeLog 1412 RMD160 2b8e9ea5f38bbe1a51c8c60af4c0122910efb2ae SHA1 e50aeb2b39f5f168d80832666fd7e5011eb1b2cb SHA256 400d82f925db119a9bc04cb13b1731bd6c2522e42d891dcf7347bb0c13942008
+EBUILD synapse-0.2.8.2.ebuild 1579 RMD160 f9694ff7efa7188cbd66fbe28dbb8782474d6d48 SHA1 b251a0d6023b75df1bcac784cced55574721deca SHA256 85f753ea90ecce179c8c8946d787f4b7aeb9797fd27fadbd4f5cd8dc68ce4ddb
+MISC ChangeLog 1587 RMD160 4f2de99ba4072ede46327c3e7441bec5575c16b6 SHA1 9436c3f0a6beef6b6c178399bc8cdbb5f616816f SHA256 c679fa3e5e0cf0513e7f3b1d9bba9872a438f825ebaf554c0748661cc9cc2e65
 MISC metadata.xml 496 RMD160 4c5424dc8f225eebaa5c911e59bd76c1d17e681d SHA1 a41d461dc837b7a7358ced8517e49690e5186df6 SHA256 78123c819a2c24f2d66e333ee0ad324edb8cc17123e478344afd4982e044d607
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
new file mode 100644
index 000000000000..5073bbc38fac
--- /dev/null
+++ b/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch
@@ -0,0 +1,16 @@
+ 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 = \
+ 	$(top_builddir)/src/core/libsynapsecore.la \
+ 	$(top_builddir)/src/plugins/libplugins.la \
+ 	$(top_builddir)/src/tile-view/libtileview.la \
+-	$(NULL)
++	$(NULL) -lm
+ 
+ if HAVE_INDICATOR
+ synapse_VALAFLAGS += --pkg appindicator-0.1 -D HAVE_INDICATOR
diff --git a/gnome-extra/synapse/synapse-0.2.8.2.ebuild b/gnome-extra/synapse/synapse-0.2.8.2.ebuild
index 876cfd24a0e3..3e9f041c8ba3 100644
--- a/gnome-extra/synapse/synapse-0.2.8.2.ebuild
+++ b/gnome-extra/synapse/synapse-0.2.8.2.ebuild
@@ -1,10 +1,12 @@
 # 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.8.2.ebuild,v 1.1 2012/01/29 16:45:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/synapse-0.2.8.2.ebuild,v 1.2 2012/01/29 18:30:53 jlec Exp $
 
 EAPI=4
 
-inherit gnome2-utils
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils gnome2-utils
 
 DESCRIPTION="A program launcher in the style of GNOME Do"
 HOMEPAGE="http://launchpad.net/synapse-project/"
@@ -41,20 +43,27 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/synapse-0.2.8.2-underlinking.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() {
-	VALAC="$(type -P valac-0.12)" \
-		econf \
-			$(use_enable ayatana indicator yes) \
-			$(use_enable plugins librest yes) \
-			$(use_enable zeitgeist)
+	local myeconfargs=(
+		$(use_enable ayatana indicator yes)
+		$(use_enable plugins librest yes)
+		$(use_enable zeitgeist)
+		VALAC="$(type -P valac-0.12)"
+		)
+	autotools-utils_src_configure
 }
 
 pkg_postinst() {