Fix libsary linkage (bug #417803).

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 25 insertions, 36 deletions

diff --git a/app-text/sary/ChangeLog b/app-text/sary/ChangeLog
index 2e7d482bcd9a..e3363033e257 100644
--- a/app-text/sary/ChangeLog
+++ b/app-text/sary/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/sary
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sary/ChangeLog,v 1.39 2012/05/04 03:33:16 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sary/ChangeLog,v 1.40 2013/03/30 18:02:49 jer Exp $
+
+  30 Mar 2013; Jeroen Roovers <jer@gentoo.org> -sary-1.2.0.ebuild,
+  sary-1.2.0-r1.ebuild:
+  Fix libsary linkage (bug #417803).
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> sary-1.2.0.ebuild,
   sary-1.2.0-r1.ebuild:
diff --git a/app-text/sary/Manifest b/app-text/sary/Manifest
index 6b9406cf2d65..23248f1e6bf9 100644
--- a/app-text/sary/Manifest
+++ b/app-text/sary/Manifest
@@ -1,5 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST sary-1.2.0.tar.gz 393787 SHA256 d4b16e32c97a253b546922d2926c8600383352f0af0d95e2938b6d846dfc6a11 SHA512 0eeae82a384970b4d96f7a0ca3929e74d17b8b3ebc61459ec9fc7172e61c3835ffe2de8aaab7ebd64f54be24d39f6734949ebc98758c28cec299b3bd25020632 WHIRLPOOL 0a63d5a507da154588228e18c777eaca251888b7b67342c31775d6f1d8b0c9f877b2e79be473807ab08dc4d9cb87779cac3bdd8290a64333b3507b65583ac7d2
-EBUILD sary-1.2.0-r1.ebuild 880 SHA256 c852335e1ed65a3a8b02c792a4ea17e6cab1047c6ade9f0988ddc1d05ee4a179 SHA512 1cbd3085c41c58ab7b4f17c8ac7eb9ccf8e7f1548497b1d3fab0875f0ac1baa0fde1ba95ba724e301effb5412f3359490f408100536ca723aa5ef1d3af648f59 WHIRLPOOL 2093742ae5653e6f3bd9792a60dab039ed51b45268756357a2d67cbbb7935102198692525e83d126a6960932873b9c79fe07a5ac8cf574959bf5257f3cf455ca
-EBUILD sary-1.2.0.ebuild 714 SHA256 b61c65e77e2e59c336ff2174dcafb1ac9e37a06804b41d1ee1af40d512d376f2 SHA512 36bf08e31ced1c7e01bf1539e7b1269ac96c4324447c8de4d4daa6635dfd17ece6b671d8f96a36dc2bbb7440772318220fba7e5d9afe3d3db56bcaa22093bda5 WHIRLPOOL 16cd1c669f99582c7a1b25347e96fa7600d164ae1e130049c4ca21618b85a659e975d056ad780ec08a22c7410f3bff57dc31c49905670c1bbefd46c8f67026b7
-MISC ChangeLog 4127 SHA256 89da2720663a89db46afe2947e6f99b5c5d200b4acaace321d44b0828967e2bc SHA512 a0a03d2b913f65ec5ed9d3bec248ccb158c9ad8de0b5415cfad930916fdc1b9c1c9f21a120c807372ce01bab671e2ca5a0f041b81783d681eca4c5efd5fb8ccc WHIRLPOOL b85027fcf673fb331b5bff9131e27c3fb95ef95d840bdbc7053d9b466068f220a3d9ff512861459c1ea557ac31d9e8a2dcb85c86de075a6aba12085cea24ee37
+EBUILD sary-1.2.0-r1.ebuild 994 SHA256 77dca096f179bbcb82ff0a94966ad4f36cf9562ae911fce2e5d4666046dc7922 SHA512 714e387d98263706dfeaac533d582371579529902747e7b4ecb614c895ee57cf17c332fbf026bc5236b9ef9c3b545c86eaba6ce817097d25d4cdb376b42fffad WHIRLPOOL 941d5b67958e40450d5d43414f22d4a768293b4bd5a16665d0f797ec78f5f5829516c07add6db9786c3413071a18424ab8a4d0b18660e862579019374cffa652
+MISC ChangeLog 4253 SHA256 add8d47187d132d9f5e70648f28cb2d0e8143cd7d679a26ccf3edb45e86b6dd4 SHA512 7d6eba078bf2f90e7dce87fd4ab7bae1bee1201f2c8abe084ce9e94ce57f2a7801c7e1249583ff501c390974cc63a37c390bc45a00af6bdd1658e17c6ee2a99c WHIRLPOOL cd90a52f275587acf628fc4710a3e991e803ef9cd574782cf09145ee17f2b4fc4bc481d1141e46a4d630927af93fbf5ac0c649039a40007d1d5cc0be54ae5865
 MISC metadata.xml 461 SHA256 8d9ef07889c9baf51cf8d60198a12a0834b1f1e48fd7840c50408d226c562694 SHA512 3dd13a382dfae7f8dc8a54108d93cae1bd416c68e5dd0db8c2fcabe468c5905860c2baa60c10d4de4bf4b67885e7af82ff70ede1683c3c55a0e0ebfd4a7138aa WHIRLPOOL 34bd9777448ed577221b79a0213eba8716c0b9a77c92ca16a553ac5bd37e9973c7b134e613eed834a7b1dc0d7ffde4472448d970580c38b62edd7b4411caf513
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlFXKMoACgkQVWmRsqeSphNBtgCfXuAF0MSNWZCaCc6c49+85L5U
+hYsAnjJ+0M0awllxLR0PVdHq0hFAPYoF
+=aLS0
+-----END PGP SIGNATURE-----
diff --git a/app-text/sary/sary-1.2.0-r1.ebuild b/app-text/sary/sary-1.2.0-r1.ebuild
index 74a5c8418ba0..2180058351dd 100644
--- a/app-text/sary/sary-1.2.0-r1.ebuild
+++ b/app-text/sary/sary-1.2.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sary/sary-1.2.0-r1.ebuild,v 1.9 2012/05/04 03:33:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sary/sary-1.2.0-r1.ebuild,v 1.10 2013/03/30 18:02:49 jer Exp $
 
 EAPI=4
+inherit autotools
 
 DESCRIPTION="Sary: suffix array library and tools"
 HOMEPAGE="http://sary.sourceforge.net/"
@@ -18,6 +19,10 @@ RDEPEND="dev-libs/glib:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+src_prepare() {
+	echo "libsary_la_LIBADD = @GLIB_LIBS@" >> sary/Makefile.am || die
+	eautoreconf
+}
 src_configure() {
 	econf $(use_enable static-libs static)
 }
diff --git a/app-text/sary/sary-1.2.0.ebuild b/app-text/sary/sary-1.2.0.ebuild
deleted file mode 100644
index d30ad2fd76f7..000000000000
--- a/app-text/sary/sary-1.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sary/sary-1.2.0.ebuild,v 1.18 2012/05/04 03:33:16 jdhore Exp $
-
-EAPI=3
-
-DESCRIPTION="Sary: suffix array library and tools"
-HOMEPAGE="http://sary.sourceforge.net/"
-SRC_URI="http://sary.sourceforge.net/${P}.tar.gz"
-IUSE=""
-
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/glib-2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-
-	make DESTDIR="${D}" \
-		docsdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install || die
-
-	dodoc [A-Z][A-Z]* ChangeLog
-
-}