1 |
I thought we had this discussion already. USE=static-libs is for |
2 |
controlling the build of static libraries, not the install alone. |
3 |
|
4 |
Changed it the way it was. |
5 |
|
6 |
On 03/12/2012 07:57 PM, Tomas Chvatal (scarabeus) wrote: |
7 |
> scarabeus 12/03/12 17:57:41 |
8 |
> |
9 |
> Modified: jbigkit-2.0-r1.ebuild ChangeLog |
10 |
> Log: |
11 |
> Deploy static libs only if wanted. |
12 |
> |
13 |
> (Portage version: 2.2.0_alpha90/cvs/Linux x86_64) |
14 |
> |
15 |
> Revision Changes Path |
16 |
> 1.11 media-libs/jbigkit/jbigkit-2.0-r1.ebuild |
17 |
> |
18 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild?rev=1.11&view=markup |
19 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild?rev=1.11&content-type=text/plain |
20 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild?r1=1.10&r2=1.11 |
21 |
> |
22 |
> Index: jbigkit-2.0-r1.ebuild |
23 |
> =================================================================== |
24 |
> RCS file: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild,v |
25 |
> retrieving revision 1.10 |
26 |
> retrieving revision 1.11 |
27 |
> diff -u -r1.10 -r1.11 |
28 |
> --- jbigkit-2.0-r1.ebuild 5 Sep 2010 13:16:55 -0000 1.10 |
29 |
> +++ jbigkit-2.0-r1.ebuild 12 Mar 2012 17:57:41 -0000 1.11 |
30 |
> @@ -1,8 +1,8 @@ |
31 |
> -# Copyright 1999-2010 Gentoo Foundation |
32 |
> +# Copyright 1999-2012 Gentoo Foundation |
33 |
> # Distributed under the terms of the GNU General Public License v2 |
34 |
> -# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild,v 1.10 2010/09/05 13:16:55 armin76 Exp $ |
35 |
> +# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild,v 1.11 2012/03/12 17:57:41 scarabeus Exp $ |
36 |
> |
37 |
> -EAPI="3" |
38 |
> +EAPI=4 |
39 |
> |
40 |
> inherit eutils multilib toolchain-funcs |
41 |
> |
42 |
> @@ -13,7 +13,7 @@ |
43 |
> LICENSE="GPL-2" |
44 |
> SLOT="0" |
45 |
> 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" |
46 |
> -IUSE="" |
47 |
> +IUSE="static-libs" |
48 |
> |
49 |
> S=${WORKDIR}/${PN} |
50 |
> |
51 |
> @@ -23,20 +23,21 @@ |
52 |
> |
53 |
> src_compile() { |
54 |
> tc-export AR CC RANLIB |
55 |
> - emake LIBDIR="${EPREFIX}/usr/$(get_libdir)" || die |
56 |
> + emake LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
57 |
> } |
58 |
> |
59 |
> src_test() { |
60 |
> - LD_LIBRARY_PATH=${S}/libjbig make -j1 test || die |
61 |
> + LD_LIBRARY_PATH=${S}/libjbig make -j1 test |
62 |
> } |
63 |
> |
64 |
> src_install() { |
65 |
> - dobin pbmtools/jbgtopbm{,85} pbmtools/pbmtojbg{,85} || die |
66 |
> + dobin pbmtools/jbgtopbm{,85} pbmtools/pbmtojbg{,85} |
67 |
> doman pbmtools/jbgtopbm.1 pbmtools/pbmtojbg.1 |
68 |
> |
69 |
> insinto /usr/include |
70 |
> - doins libjbig/*.h || die |
71 |
> - dolib libjbig/libjbig{,85}{.a,$(get_libname)} || die |
72 |
> + doins libjbig/*.h |
73 |
> + dolib libjbig/libjbig{,85}$(get_libname) |
74 |
> + use static-libs&& dolib libjbig/libjbig{,85}.a |
75 |
> |
76 |
> dodoc ANNOUNCE CHANGES TODO libjbig/*.txt |
77 |
> } |
78 |
> |
79 |
> |
80 |
> |
81 |
> 1.51 media-libs/jbigkit/ChangeLog |
82 |
> |
83 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbigkit/ChangeLog?rev=1.51&view=markup |
84 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbigkit/ChangeLog?rev=1.51&content-type=text/plain |
85 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jbigkit/ChangeLog?r1=1.50&r2=1.51 |
86 |
> |
87 |
> Index: ChangeLog |
88 |
> =================================================================== |
89 |
> RCS file: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v |
90 |
> retrieving revision 1.50 |
91 |
> retrieving revision 1.51 |
92 |
> diff -u -r1.50 -r1.51 |
93 |
> --- ChangeLog 9 Oct 2011 11:59:40 -0000 1.50 |
94 |
> +++ ChangeLog 12 Mar 2012 17:57:41 -0000 1.51 |
95 |
> @@ -1,6 +1,9 @@ |
96 |
> # ChangeLog for media-libs/jbigkit |
97 |
> -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
98 |
> -# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.50 2011/10/09 11:59:40 ssuominen Exp $ |
99 |
> +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
100 |
> +# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.51 2012/03/12 17:57:41 scarabeus Exp $ |
101 |
> + |
102 |
> + 12 Mar 2012; Tomáš Chvátal<scarabeus@g.o> jbigkit-2.0-r1.ebuild: |
103 |
> + Deploy static libs only if wanted. |
104 |
> |
105 |
> 09 Oct 2011; Samuli Suominen<ssuominen@g.o> -jbigkit-1.6-r1.ebuild, |
106 |
> -files/jbigkit-1.6-build.patch, -files/jbigkit-1.6-respect-make.patch, |
107 |
> |
108 |
> |
109 |
> |
110 |
> |