| 1 |
mgorny 14/01/04 23:06:59 |
| 2 |
|
| 3 |
Modified: alsa-lib-1.0.27.1-r1.ebuild |
| 4 |
alsa-lib-1.0.27.2.ebuild ChangeLog |
| 5 |
Log: |
| 6 |
Replace the explicit ABI==DEFAULT_ABI check with multilib_build_binaries eclass function. Remove unnecessary Python hackery (python-config is wrapped by the eclass). |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: alsa-lib-1.0.27.1-r1.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- alsa-lib-1.0.27.1-r1.ebuild 19 Jul 2013 16:41:41 -0000 1.2 |
| 24 |
+++ alsa-lib-1.0.27.1-r1.ebuild 4 Jan 2014 23:06:59 -0000 1.3 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
-# Copyright 1999-2013 Gentoo Foundation |
| 27 |
+# Copyright 1999-2014 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild,v 1.2 2013/07/19 16:41:41 ssuominen Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild,v 1.3 2014/01/04 23:06:59 mgorny Exp $ |
| 31 |
|
| 32 |
EAPI=5 |
| 33 |
|
| 34 |
@@ -38,7 +38,7 @@ |
| 35 |
multilib_src_configure() { |
| 36 |
local myconf |
| 37 |
# enable Python only on final ABI |
| 38 |
- if [[ ${ABI} == ${DEFAULT_ABI} ]]; then |
| 39 |
+ if multilib_build_binaries; then |
| 40 |
myconf="$(use_enable python)" |
| 41 |
else |
| 42 |
myconf="--disable-python" |
| 43 |
@@ -61,7 +61,7 @@ |
| 44 |
multilib_src_compile() { |
| 45 |
emake |
| 46 |
|
| 47 |
- if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then |
| 48 |
+ if multilib_build_binaries && use doc; then |
| 49 |
emake doc |
| 50 |
fgrep -Zrl "${S}" doc/doxygen/html | \ |
| 51 |
xargs -0 sed -i -e "s:${S}::" |
| 52 |
@@ -70,7 +70,7 @@ |
| 53 |
|
| 54 |
multilib_src_install() { |
| 55 |
emake DESTDIR="${D}" install |
| 56 |
- if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then |
| 57 |
+ if multilib_build_binaries && use doc; then |
| 58 |
dohtml -r doc/doxygen/html/. |
| 59 |
fi |
| 60 |
} |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
1.3 media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild |
| 65 |
|
| 66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild?rev=1.3&view=markup |
| 67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild?rev=1.3&content-type=text/plain |
| 68 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild?r1=1.2&r2=1.3 |
| 69 |
|
| 70 |
Index: alsa-lib-1.0.27.2.ebuild |
| 71 |
=================================================================== |
| 72 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild,v |
| 73 |
retrieving revision 1.2 |
| 74 |
retrieving revision 1.3 |
| 75 |
diff -u -r1.2 -r1.3 |
| 76 |
--- alsa-lib-1.0.27.2.ebuild 30 Jul 2013 13:05:57 -0000 1.2 |
| 77 |
+++ alsa-lib-1.0.27.2.ebuild 4 Jan 2014 23:06:59 -0000 1.3 |
| 78 |
@@ -1,6 +1,6 @@ |
| 79 |
-# Copyright 1999-2013 Gentoo Foundation |
| 80 |
+# Copyright 1999-2014 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
-# $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 $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild,v 1.3 2014/01/04 23:06:59 mgorny Exp $ |
| 84 |
|
| 85 |
EAPI=5 |
| 86 |
|
| 87 |
@@ -32,9 +32,6 @@ |
| 88 |
|
| 89 |
src_prepare() { |
| 90 |
find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die |
| 91 |
- if [[ ${ABI} == ${DEFAULT_ABI} ]]; then |
| 92 |
- use python && { sed -i -e "s:python-config:$EPYTHON-config:" configure.in || die; } |
| 93 |
- fi |
| 94 |
epatch_user |
| 95 |
eautoreconf |
| 96 |
} |
| 97 |
@@ -42,7 +39,7 @@ |
| 98 |
multilib_src_configure() { |
| 99 |
local myconf |
| 100 |
# enable Python only on final ABI |
| 101 |
- if [[ ${ABI} == ${DEFAULT_ABI} ]]; then |
| 102 |
+ if multilib_build_binaries; then |
| 103 |
myconf="$(use_enable python)" |
| 104 |
else |
| 105 |
myconf="--disable-python" |
| 106 |
@@ -65,7 +62,7 @@ |
| 107 |
multilib_src_compile() { |
| 108 |
emake |
| 109 |
|
| 110 |
- if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then |
| 111 |
+ if multilib_build_binaries && use doc; then |
| 112 |
emake doc |
| 113 |
fgrep -Zrl "${S}" doc/doxygen/html | \ |
| 114 |
xargs -0 sed -i -e "s:${S}::" |
| 115 |
@@ -74,7 +71,7 @@ |
| 116 |
|
| 117 |
multilib_src_install() { |
| 118 |
emake DESTDIR="${D}" install |
| 119 |
- if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then |
| 120 |
+ if multilib_build_binaries && use doc; then |
| 121 |
dohtml -r doc/doxygen/html/. |
| 122 |
fi |
| 123 |
} |
| 124 |
|
| 125 |
|
| 126 |
|
| 127 |
1.380 media-libs/alsa-lib/ChangeLog |
| 128 |
|
| 129 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/ChangeLog?rev=1.380&view=markup |
| 130 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/ChangeLog?rev=1.380&content-type=text/plain |
| 131 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/alsa-lib/ChangeLog?r1=1.379&r2=1.380 |
| 132 |
|
| 133 |
Index: ChangeLog |
| 134 |
=================================================================== |
| 135 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v |
| 136 |
retrieving revision 1.379 |
| 137 |
retrieving revision 1.380 |
| 138 |
diff -u -r1.379 -r1.380 |
| 139 |
--- ChangeLog 1 Sep 2013 18:36:03 -0000 1.379 |
| 140 |
+++ ChangeLog 4 Jan 2014 23:06:59 -0000 1.380 |
| 141 |
@@ -1,6 +1,12 @@ |
| 142 |
# ChangeLog for media-libs/alsa-lib |
| 143 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 144 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.379 2013/09/01 18:36:03 ago Exp $ |
| 145 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 146 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.380 2014/01/04 23:06:59 mgorny Exp $ |
| 147 |
+ |
| 148 |
+ 04 Jan 2014; Michał Górny <mgorny@g.o> alsa-lib-1.0.27.1-r1.ebuild, |
| 149 |
+ alsa-lib-1.0.27.2.ebuild: |
| 150 |
+ Replace the explicit ABI==DEFAULT_ABI check with multilib_build_binaries |
| 151 |
+ eclass function. Remove unnecessary Python hackery (python-config is wrapped |
| 152 |
+ by the eclass). |
| 153 |
|
| 154 |
01 Sep 2013; Agostino Sarubbo <ago@g.o> alsa-lib-1.0.27.1.ebuild: |
| 155 |
Stable for alpha, wrt bug #473404 |
Archives