| 1 |
aballier 13/07/29 22:05:22 |
| 2 |
|
| 3 |
Modified: libsndfile-1.0.25-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Improve multilib support: alsa and sqlite are actually only needed for installed binaries, hence useless for non native ABIs. Do not build binaries for non native ABIs and drop now uselss MULTILIB_USEDEP on their deps. Slat it for emul-linux-x86-soundlibs-20130224-r7. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: libsndfile-1.0.25-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- libsndfile-1.0.25-r1.ebuild 5 May 2013 08:04:11 -0000 1.1 |
| 23 |
+++ libsndfile-1.0.25-r1.ebuild 29 Jul 2013 22:05:21 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild,v 1.1 2013/05/05 08:04:11 mgorny Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild,v 1.2 2013/07/29 22:05:21 aballier Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -28,14 +28,10 @@ |
| 33 |
!minimal? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] |
| 34 |
>=media-libs/libogg-1.1.3[${MULTILIB_USEDEP}] |
| 35 |
>=media-libs/libvorbis-1.2.3[${MULTILIB_USEDEP}] ) |
| 36 |
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) |
| 37 |
- sqlite? ( |
| 38 |
- >=dev-db/sqlite-3.2 |
| 39 |
- amd64? ( abi_x86_32? ( |
| 40 |
- app-emulation/emul-linux-x86-baselibs[development] |
| 41 |
- ) ) |
| 42 |
- ) |
| 43 |
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" |
| 44 |
+ alsa? ( media-libs/alsa-lib ) |
| 45 |
+ sqlite? ( >=dev-db/sqlite-3.2 ) |
| 46 |
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6 |
| 47 |
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" |
| 48 |
DEPEND="${RDEPEND} |
| 49 |
virtual/pkgconfig |
| 50 |
test? ( ${PYTHON_DEPS} )" |
| 51 |
@@ -58,19 +54,39 @@ |
| 52 |
} |
| 53 |
|
| 54 |
src_configure() { |
| 55 |
- local myeconfargs=( |
| 56 |
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html |
| 57 |
- |
| 58 |
- $(use_enable sqlite) |
| 59 |
- $(use_enable static-libs static) |
| 60 |
- $(use_enable alsa) |
| 61 |
- $(use_enable !minimal external-libs) |
| 62 |
- --disable-octave |
| 63 |
- --disable-gcc-werror |
| 64 |
- --disable-gcc-pipe |
| 65 |
- ) |
| 66 |
+ my_configure() { |
| 67 |
+ local myeconfargs=( |
| 68 |
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html |
| 69 |
+ $(use_enable static-libs static) |
| 70 |
+ $(use_enable !minimal external-libs) |
| 71 |
+ --disable-octave |
| 72 |
+ --disable-gcc-werror |
| 73 |
+ --disable-gcc-pipe |
| 74 |
+ ) |
| 75 |
+ |
| 76 |
+ if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then |
| 77 |
+ myeconfargs+=( |
| 78 |
+ $(use_enable alsa) |
| 79 |
+ $(use_enable sqlite) |
| 80 |
+ ) |
| 81 |
+ else |
| 82 |
+ myeconfargs+=( |
| 83 |
+ --disable-alsa |
| 84 |
+ --disable-sqlite |
| 85 |
+ ) |
| 86 |
+ fi |
| 87 |
+ |
| 88 |
+ autotools-utils_src_configure |
| 89 |
+ |
| 90 |
+ if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then |
| 91 |
+ # Do not build useless stuff. |
| 92 |
+ for i in man doc examples regtest programs ; do |
| 93 |
+ sed -i -e "s/ ${i}//" "${BUILD_DIR}/Makefile" || die |
| 94 |
+ done |
| 95 |
+ fi |
| 96 |
+ } |
| 97 |
|
| 98 |
- autotools-multilib_src_configure |
| 99 |
+ multilib_parallel_foreach_abi my_configure |
| 100 |
} |
| 101 |
|
| 102 |
src_install() { |
| 103 |
|
| 104 |
|
| 105 |
|
| 106 |
1.136 media-libs/libsndfile/ChangeLog |
| 107 |
|
| 108 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsndfile/ChangeLog?rev=1.136&view=markup |
| 109 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsndfile/ChangeLog?rev=1.136&content-type=text/plain |
| 110 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsndfile/ChangeLog?r1=1.135&r2=1.136 |
| 111 |
|
| 112 |
Index: ChangeLog |
| 113 |
=================================================================== |
| 114 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v |
| 115 |
retrieving revision 1.135 |
| 116 |
retrieving revision 1.136 |
| 117 |
diff -u -r1.135 -r1.136 |
| 118 |
--- ChangeLog 5 May 2013 08:04:11 -0000 1.135 |
| 119 |
+++ ChangeLog 29 Jul 2013 22:05:21 -0000 1.136 |
| 120 |
@@ -1,6 +1,13 @@ |
| 121 |
# ChangeLog for media-libs/libsndfile |
| 122 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 123 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.135 2013/05/05 08:04:11 mgorny Exp $ |
| 124 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.136 2013/07/29 22:05:21 aballier Exp $ |
| 125 |
+ |
| 126 |
+ 29 Jul 2013; Alexis Ballier <aballier@g.o> |
| 127 |
+ libsndfile-1.0.25-r1.ebuild: |
| 128 |
+ Improve multilib support: alsa and sqlite are actually only needed for |
| 129 |
+ installed binaries, hence useless for non native ABIs. Do not build binaries |
| 130 |
+ for non native ABIs and drop now uselss MULTILIB_USEDEP on their deps. Slat |
| 131 |
+ it for emul-linux-x86-soundlibs-20130224-r7. |
| 132 |
|
| 133 |
*libsndfile-1.0.25-r1 (05 May 2013) |
Archives