summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-03-30 18:02:49 +0000
committerJeroen Roovers <jer@gentoo.org>2013-03-30 18:02:49 +0000
commit2735e7094fdf57f88933ffa00bbfedbb85097d31 (patch)
tree2b35f7ac8d53d23602321877a9fd47c021f1d22c /app-text/sary
parentBugfix for 463800 (diff)
downloadgentoo-2-2735e7094fdf57f88933ffa00bbfedbb85097d31.tar.gz
gentoo-2-2735e7094fdf57f88933ffa00bbfedbb85097d31.tar.bz2
gentoo-2-2735e7094fdf57f88933ffa00bbfedbb85097d31.zip
Fix libsary linkage (bug #417803).
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-text/sary')
-rw-r--r--app-text/sary/ChangeLog8
-rw-r--r--app-text/sary/sary-1.2.0-r1.ebuild9
-rw-r--r--app-text/sary/sary-1.2.0.ebuild29
3 files changed, 13 insertions, 33 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/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
-
-}