summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-03-12 17:57:41 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-03-12 17:57:41 +0000
commitadbd9328e507c04a8f732b8bdf6202ae8de4d0e9 (patch)
tree03431487b3f436d0c015b578b095b20a8b85e7ae /media-libs/jbigkit
parentMarking lockfile-0.9.1 ppc for bug 407429 (diff)
downloadgentoo-2-adbd9328e507c04a8f732b8bdf6202ae8de4d0e9.tar.gz
gentoo-2-adbd9328e507c04a8f732b8bdf6202ae8de4d0e9.tar.bz2
gentoo-2-adbd9328e507c04a8f732b8bdf6202ae8de4d0e9.zip
Deploy static libs only if wanted.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/jbigkit')
-rw-r--r--media-libs/jbigkit/ChangeLog7
-rw-r--r--media-libs/jbigkit/jbigkit-2.0-r1.ebuild19
2 files changed, 15 insertions, 11 deletions
diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog
index 67c766cfc77b..45be158b43a3 100644
--- a/media-libs/jbigkit/ChangeLog
+++ b/media-libs/jbigkit/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/jbigkit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.50 2011/10/09 11:59:40 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.51 2012/03/12 17:57:41 scarabeus Exp $
+
+ 12 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> jbigkit-2.0-r1.ebuild:
+ Deploy static libs only if wanted.
09 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -jbigkit-1.6-r1.ebuild,
-files/jbigkit-1.6-build.patch, -files/jbigkit-1.6-respect-make.patch,
diff --git a/media-libs/jbigkit/jbigkit-2.0-r1.ebuild b/media-libs/jbigkit/jbigkit-2.0-r1.ebuild
index 7f1a88bb5f2d..a39d38950d03 100644
--- a/media-libs/jbigkit/jbigkit-2.0-r1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild,v 1.10 2010/09/05 13:16:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild,v 1.11 2012/03/12 17:57:41 scarabeus Exp $
-EAPI="3"
+EAPI=4
inherit eutils multilib toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+IUSE="static-libs"
S=${WORKDIR}/${PN}
@@ -23,20 +23,21 @@ src_prepare() {
src_compile() {
tc-export AR CC RANLIB
- emake LIBDIR="${EPREFIX}/usr/$(get_libdir)" || die
+ emake LIBDIR="${EPREFIX}/usr/$(get_libdir)"
}
src_test() {
- LD_LIBRARY_PATH=${S}/libjbig make -j1 test || die
+ LD_LIBRARY_PATH=${S}/libjbig make -j1 test
}
src_install() {
- dobin pbmtools/jbgtopbm{,85} pbmtools/pbmtojbg{,85} || die
+ dobin pbmtools/jbgtopbm{,85} pbmtools/pbmtojbg{,85}
doman pbmtools/jbgtopbm.1 pbmtools/pbmtojbg.1
insinto /usr/include
- doins libjbig/*.h || die
- dolib libjbig/libjbig{,85}{.a,$(get_libname)} || die
+ doins libjbig/*.h
+ dolib libjbig/libjbig{,85}$(get_libname)
+ use static-libs && dolib libjbig/libjbig{,85}.a
dodoc ANNOUNCE CHANGES TODO libjbig/*.txt
}