1 |
ssuominen 13/07/30 13:05:57 |
2 |
|
3 |
Modified: ChangeLog alsa-lib-1.0.27.2.ebuild |
4 |
alsa-lib-1.0.27.1.ebuild |
5 |
Log: |
6 |
Force use of correct python-config wrt #478802 by Frank Krömmelbein |
7 |
|
8 |
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.370 media-libs/alsa-lib/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/ChangeLog?rev=1.370&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/ChangeLog?rev=1.370&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/ChangeLog?r1=1.369&r2=1.370 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v |
20 |
retrieving revision 1.369 |
21 |
retrieving revision 1.370 |
22 |
diff -u -r1.369 -r1.370 |
23 |
--- ChangeLog 30 Jul 2013 09:07:52 -0000 1.369 |
24 |
+++ ChangeLog 30 Jul 2013 13:05:57 -0000 1.370 |
25 |
@@ -1,6 +1,10 @@ |
26 |
# ChangeLog for media-libs/alsa-lib |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.369 2013/07/30 09:07:52 ago Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.370 2013/07/30 13:05:57 ssuominen Exp $ |
30 |
+ |
31 |
+ 30 Jul 2013; Samuli Suominen <ssuominen@g.o> alsa-lib-1.0.27.1.ebuild, |
32 |
+ alsa-lib-1.0.27.2.ebuild: |
33 |
+ Force use of correct python-config wrt #478802 by Frank Krömmelbein |
34 |
|
35 |
30 Jul 2013; Agostino Sarubbo <ago@g.o> alsa-lib-1.0.27.1.ebuild: |
36 |
Stable for amd64, wrt bug #473404 |
37 |
|
38 |
|
39 |
|
40 |
1.2 media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: alsa-lib-1.0.27.2.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- alsa-lib-1.0.27.2.ebuild 18 Jul 2013 16:42:15 -0000 1.1 |
53 |
+++ alsa-lib-1.0.27.2.ebuild 30 Jul 2013 13:05:57 -0000 1.2 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2013 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild,v 1.1 2013/07/18 16:42:15 ssuominen Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild,v 1.2 2013/07/30 13:05:57 ssuominen Exp $ |
59 |
|
60 |
EAPI=5 |
61 |
|
62 |
@@ -32,6 +32,9 @@ |
63 |
|
64 |
src_prepare() { |
65 |
find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die |
66 |
+ if [[ ${ABI} == ${DEFAULT_ABI} ]]; then |
67 |
+ use python && { sed -i -e "s:python-config:$EPYTHON-config:" configure.in || die; } |
68 |
+ fi |
69 |
epatch_user |
70 |
eautoreconf |
71 |
} |
72 |
|
73 |
|
74 |
|
75 |
1.6 media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild |
76 |
|
77 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild?rev=1.6&view=markup |
78 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild?rev=1.6&content-type=text/plain |
79 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild?r1=1.5&r2=1.6 |
80 |
|
81 |
Index: alsa-lib-1.0.27.1.ebuild |
82 |
=================================================================== |
83 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild,v |
84 |
retrieving revision 1.5 |
85 |
retrieving revision 1.6 |
86 |
diff -u -r1.5 -r1.6 |
87 |
--- alsa-lib-1.0.27.1.ebuild 30 Jul 2013 09:07:52 -0000 1.5 |
88 |
+++ alsa-lib-1.0.27.1.ebuild 30 Jul 2013 13:05:57 -0000 1.6 |
89 |
@@ -1,6 +1,6 @@ |
90 |
# Copyright 1999-2013 Gentoo Foundation |
91 |
# Distributed under the terms of the GNU General Public License v2 |
92 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild,v 1.5 2013/07/30 09:07:52 ago Exp $ |
93 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild,v 1.6 2013/07/30 13:05:57 ssuominen Exp $ |
94 |
|
95 |
EAPI=5 |
96 |
|
97 |
@@ -28,6 +28,10 @@ |
98 |
|
99 |
src_prepare() { |
100 |
find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die |
101 |
+ # force use of correct python-config wrt #478802 |
102 |
+ if [[ ${ABI} == ${DEFAULT_ABI} ]]; then |
103 |
+ use python && { sed -i -e "s:python-config:$EPYTHON-config:" configure.in || die; } |
104 |
+ fi |
105 |
epatch "${FILESDIR}"/${P}-rewind.patch #477282 |
106 |
epatch_user |
107 |
eautoreconf |