From 3e60eb0646a3ccf731a6ea3edd7bef2809a757aa Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Mon, 28 Nov 2011 06:50:56 +0000 Subject: [PATCH] Fix autotools-utils usage. Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64 --- media-libs/libraw/ChangeLog | 5 ++++- media-libs/libraw/Manifest | 18 +++++++++--------- media-libs/libraw/libraw-0.14.3.ebuild | 25 +++++++++++++------------ 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/media-libs/libraw/ChangeLog b/media-libs/libraw/ChangeLog index 256868845b3e..9d0c1e38b0a0 100644 --- a/media-libs/libraw/ChangeLog +++ b/media-libs/libraw/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/libraw # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/ChangeLog,v 1.15 2011/11/27 04:12:14 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/ChangeLog,v 1.16 2011/11/28 06:50:56 radhermit Exp $ + + 28 Nov 2011; Tim Harder libraw-0.14.3.ebuild: + Fix autotools-utils usage. 27 Nov 2011; Tim Harder libraw-0.14.3.ebuild: Build in the source tree. diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest index 972f5fce32ad..db8321f9d3a9 100644 --- a/media-libs/libraw/Manifest +++ b/media-libs/libraw/Manifest @@ -5,17 +5,17 @@ AUX libraw-0.13.4-docs.patch 440 RMD160 56e30a1e988f2deff0b22cfbc5dc488c46d886b4 DIST LibRaw-0.14.3.tar.gz 1354720 RMD160 1350305184ba88572e176952631332ffb4528183 SHA1 f67f9ae27281b9b8fd8f228e97dc8969ae8bb7b0 SHA256 80ae0c1bd8267aa6f0fe8d83131a16ff7667485536cdbcedd28e4f2b590e6bda DIST LibRaw-demosaic-pack-GPL2-0.14.3.tar.gz 30856 RMD160 62cf3d8392f245b409aa3930c09ca92781b18c59 SHA1 7de834d00690b82c88b0bdb7984f82690e69f451 SHA256 9463ad56bd0014f23efec98921daf289a3c1d9d2a739c957603e251cb2cf2db7 DIST LibRaw-demosaic-pack-GPL3-0.14.3.tar.gz 38525 RMD160 9292ae65746165f1a10fff2388f0bf24c044738e SHA1 94ef4a53587d8dda04cb73743511f51f352a5d2f SHA256 43831b44e4e467be01836985b4d1623f4faf88ce0300d24486b70e64ffa2444f -EBUILD libraw-0.14.3.ebuild 1446 RMD160 fa006b635802386ac9c402ec94d50e22292b77ad SHA1 2f265f8b36d284cbdc92df5776ed1b90afc487c2 SHA256 b3c3e99848905c65da62ba8229e875429af881b31bcca41eddbfb0bc245b110a -MISC ChangeLog 2930 RMD160 befffb90aaf3aa88ce621cfc291fff8f75d4d683 SHA1 2f1c34c46d9d9b63e7775555fe1356b5ddd29d99 SHA256 c59c03b9cd3f41cf21b83e2662d6235806f4fab2bc914a1d5574702633f538cf +EBUILD libraw-0.14.3.ebuild 1443 RMD160 b5cc65d0a85de4dd920e2751ada07fdd8cb4e3a9 SHA1 0832b518fa0c3b11b7e24dfa1a54284fb050280d SHA256 cea82a09752eecd5a8f39820dad914a3b7a7d3516bb7d9aaac4ba926f6752274 +MISC ChangeLog 3031 RMD160 6ec46019dc40f977acd513a72893e242ae2e7a17 SHA1 80b5623385dc0c408c78a8405b5bbe1caf5bd3dd SHA256 d6b4f2195ed8720a4e8832d8c7a5b3e40cc5c21967d5e440935e97619fb32392 MISC metadata.xml 515 RMD160 ba90ac56bc6824b362d6d168bf2880a9d6cef952 SHA1 2c54b673c20bbad11c37638acb9196ff6c25091e SHA256 690dbe70799121fc2073e88a34265726c32cbde77f9c0fac4851a35b34bc33df -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJO0bikAAoJEEqz6FtPBkyjQkIH/jecvu6ZBg/a+D363ZJwXmlv -LSFajQHVDWjIbTg4rSmCdkHcqOAI4w30wJw5YXwMHteoOuEarBFyEeUWSe3yFEjI -Bc0hif6+Lfq5d0PRtzE/xQ7W5Z9amv+YuvJVdTlG6iAAfTjV6msJY1gHKZj5mdL/ -3LEiL3cdi7Ii5XgG3NB+P19uBSJrvDUJAS4cLn4hSHkU7LiYtHQqgz8nxMkUyyJT -tjln6PSfRKWy1CWWU0vXnNzopeHort+gvn9eAEEIYpfgJwIU7eEbGTkqDMRX7+m5 -FkCSyp0tiuu+bCHtEreqaf2Y0vDmoSMPUsjJZ0MMQQ+kUTRMnGtxz9fw/ZvYxCw= -=qHu0 +iQEcBAEBCgAGBQJO0y9WAAoJEEqz6FtPBkyjDAQH/jmcaUCdO3MJDYf3VI8nJJds +xFMbx32f9LcFeAiI740lTuqyc+Udc7AIWPx7TPYVQs1O/fcTC3ssH8Xd9Cw74MG2 +IIdODzEReTXx7pe4IfHtZzXuOL3dqEM4TY9gji0T/H8BW90lIEC3G5zwdiU+RaTQ +MjWTgtDkgFrvHSc9JVtBz6eQXRn6ud94jeXR1Aw28fsiYw1YLOG1UcoJkbA8u6cg +PrdPXOl6xf2TCpBUxql5hgShwuCLCOPb6C7Lm6dp0FqKhGlefzG5CQfxIGP1tLK6 +Jcy0CntfhIt+RNKj0p9xa2o/cPzRrMZEzvjfanR1ojEaBca1QKzgan57rIKl+X8= +=srG1 -----END PGP SIGNATURE----- diff --git a/media-libs/libraw/libraw-0.14.3.ebuild b/media-libs/libraw/libraw-0.14.3.ebuild index d1bd1d947d46..bbd8c4fbc172 100644 --- a/media-libs/libraw/libraw-0.14.3.ebuild +++ b/media-libs/libraw/libraw-0.14.3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/libraw-0.14.3.ebuild,v 1.2 2011/11/27 04:12:14 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/libraw-0.14.3.ebuild,v 1.3 2011/11/28 06:50:56 radhermit Exp $ EAPI="4" -inherit eutils autotools-utils +inherit autotools-utils MY_P="LibRaw-${PV}" DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras" @@ -31,20 +31,21 @@ S="${WORKDIR}/${MY_P}" DOCS=( Changelog.txt README ) -AUTOTOOLS_IN_SOURCE_BUILD=1 +PATCHES=( "${FILESDIR}"/${PN}-0.13.4-docs.patch ) src_prepare() { - epatch "${FILESDIR}"/${PN}-0.13.4-docs.patch + autotools-utils_src_prepare eautomake } src_configure() { - econf \ - $(use_enable demosaic demosaic-pack-gpl2) \ - $(use_enable demosaic demosaic-pack-gpl3) \ - $(use_enable examples) \ - $(use_enable jpeg2k jasper) \ - $(use_enable lcms) \ - $(use_enable openmp) \ - $(use_enable static-libs static) + local myeconfargs=( + $(use_enable demosaic demosaic-pack-gpl2) + $(use_enable demosaic demosaic-pack-gpl3) + $(use_enable examples) + $(use_enable jpeg2k jasper) + $(use_enable lcms) + $(use_enable openmp) + ) + autotools-utils_src_configure } -- 2.26.2