1 |
On 10/23/2011 03:00 PM, Tomas Chvatal (scarabeus) wrote: |
2 |
> scarabeus 11/10/23 12:00:55 |
3 |
> |
4 |
> Modified: ChangeLog cdparanoia-3.10.2-r3.ebuild |
5 |
> Log: |
6 |
> Bump to eapi4 and punt static libs. |
7 |
|
8 |
Time to revert this commit as I don't see anything in the ebuild that |
9 |
disables building the static archives at compile phase. |
10 |
|
11 |
This is same as hiding the problem, not solving it. Not the way we do |
12 |
things at sound@. |
13 |
|
14 |
> |
15 |
> (Portage version: 2.2.0_alpha70/cvs/Linux x86_64) |
16 |
> |
17 |
> Revision Changes Path |
18 |
> 1.103 media-sound/cdparanoia/ChangeLog |
19 |
> |
20 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/cdparanoia/ChangeLog?rev=1.103&view=markup |
21 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/cdparanoia/ChangeLog?rev=1.103&content-type=text/plain |
22 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/cdparanoia/ChangeLog?r1=1.102&r2=1.103 |
23 |
> |
24 |
> Index: ChangeLog |
25 |
> =================================================================== |
26 |
> RCS file: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v |
27 |
> retrieving revision 1.102 |
28 |
> retrieving revision 1.103 |
29 |
> diff -u -r1.102 -r1.103 |
30 |
> --- ChangeLog 21 Jan 2010 22:46:49 -0000 1.102 |
31 |
> +++ ChangeLog 23 Oct 2011 12:00:55 -0000 1.103 |
32 |
> @@ -1,6 +1,10 @@ |
33 |
> # ChangeLog for media-sound/cdparanoia |
34 |
> -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
35 |
> -# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.102 2010/01/21 22:46:49 abcd Exp $ |
36 |
> +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
37 |
> +# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.103 2011/10/23 12:00:55 scarabeus Exp $ |
38 |
> + |
39 |
> + 23 Oct 2011; Tomáš Chvátal <scarabeus@g.o> |
40 |
> + cdparanoia-3.10.2-r3.ebuild: |
41 |
> + Bump to eapi4 and punt static libs. |
42 |
> |
43 |
> 21 Jan 2010; Jonathan Callen <abcd@g.o> |
44 |
> cdparanoia-3.10.2-r3.ebuild: |
45 |
> |
46 |
> |
47 |
> |
48 |
> 1.11 media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild |
49 |
> |
50 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild?rev=1.11&view=markup |
51 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild?rev=1.11&content-type=text/plain |
52 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild?r1=1.10&r2=1.11 |
53 |
> |
54 |
> Index: cdparanoia-3.10.2-r3.ebuild |
55 |
> =================================================================== |
56 |
> RCS file: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild,v |
57 |
> retrieving revision 1.10 |
58 |
> retrieving revision 1.11 |
59 |
> diff -u -r1.10 -r1.11 |
60 |
> --- cdparanoia-3.10.2-r3.ebuild 21 Jan 2010 22:46:49 -0000 1.10 |
61 |
> +++ cdparanoia-3.10.2-r3.ebuild 23 Oct 2011 12:00:55 -0000 1.11 |
62 |
> @@ -1,8 +1,9 @@ |
63 |
> -# Copyright 1999-2010 Gentoo Foundation |
64 |
> +# Copyright 1999-2011 Gentoo Foundation |
65 |
> # Distributed under the terms of the GNU General Public License v2 |
66 |
> -# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild,v 1.10 2010/01/21 22:46:49 abcd Exp $ |
67 |
> +# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild,v 1.11 2011/10/23 12:00:55 scarabeus Exp $ |
68 |
> + |
69 |
> +EAPI=4 |
70 |
> |
71 |
> -EAPI=2 |
72 |
> inherit autotools eutils flag-o-matic libtool toolchain-funcs versionator |
73 |
> |
74 |
> MY_P=${PN}-III-$(get_version_component_range 2-3) |
75 |
> @@ -14,7 +15,7 @@ |
76 |
> LICENSE="GPL-2 LGPL-2.1" |
77 |
> SLOT="0" |
78 |
> KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" |
79 |
> -IUSE="" |
80 |
> +IUSE="static-libs" |
81 |
> |
82 |
> S=${WORKDIR}/${MY_P} |
83 |
> |
84 |
> @@ -37,10 +38,10 @@ |
85 |
> } |
86 |
> |
87 |
> src_compile() { |
88 |
> - emake OPT="${CFLAGS}" || die "emake failed" |
89 |
> + emake OPT="${CFLAGS}" |
90 |
> } |
91 |
> |
92 |
> src_install() { |
93 |
> - emake DESTDIR="${D}" install || die "emake install failed" |
94 |
> - dodoc README |
95 |
> + default |
96 |
> + use static-libs || find "${ED}" -name '*.a' -exec rm -f {} + |
97 |
> } |
98 |
> |
99 |
> |
100 |
> |
101 |
> |