[gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in media-libs/jbigkit: jbigkit-2.0-r1.ebuild ChangeLog

[Samuli Suominen]

I thought we had this discussion already. USE=static-libs is for 
controlling the build of static libraries, not the install alone.

Changed it the way it was.

On 03/12/2012 07:57 PM, Tomas Chvatal (scarabeus) wrote:
> scarabeus    12/03/12 17:57:41
>
>    Modified:             jbigkit-2.0-r1.ebuild ChangeLog
>    Log:
>    Deploy static libs only if wanted.
>
>    (Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
>
> Revision  Changes    Path
> 1.11                 media-libs/jbigkit/jbigkit-2.0-r1.ebuild
>
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild?rev=1.11&view=markup
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild?rev=1.11&content-type=text/plain
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild?r1=1.10&r2=1.11
>
> Index: jbigkit-2.0-r1.ebuild
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild,v
> retrieving revision 1.10
> retrieving revision 1.11
> diff -u -r1.10 -r1.11
> --- jbigkit-2.0-r1.ebuild	5 Sep 2010 13:16:55 -0000	1.10
> +++ jbigkit-2.0-r1.ebuild	12 Mar 2012 17:57:41 -0000	1.11
> @@ -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 @@
>   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_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
>   }
>
>
>
> 1.51                 media-libs/jbigkit/ChangeLog
>
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbigkit/ChangeLog?rev=1.51&view=markup
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbigkit/ChangeLog?rev=1.51&content-type=text/plain
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbigkit/ChangeLog?r1=1.50&r2=1.51
>
> Index: ChangeLog
> ===================================================================
> RCS file: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v
> retrieving revision 1.50
> retrieving revision 1.51
> diff -u -r1.50 -r1.51
> --- ChangeLog	9 Oct 2011 11:59:40 -0000	1.50
> +++ ChangeLog	12 Mar 2012 17:57:41 -0000	1.51
> @@ -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@g.o>  jbigkit-2.0-r1.ebuild:
> +  Deploy static libs only if wanted.
>
>     09 Oct 2011; Samuli Suominen<ssuominen@g.o>  -jbigkit-1.6-r1.ebuild,
>     -files/jbigkit-1.6-build.patch, -files/jbigkit-1.6-respect-make.patch,
>
>
>
>