From 3a444f3f7fc22c4cc80312afb77b9ae47b840c1a Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Mon, 28 Nov 2011 03:20:05 +0000 Subject: [PATCH] Revert to autotools eclass (fixes bug #392149). Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64 --- media-libs/libmediainfo/ChangeLog | 5 ++++- media-libs/libmediainfo/Manifest | 18 +++++++++--------- .../libmediainfo/libmediainfo-0.7.51.ebuild | 8 +++----- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/media-libs/libmediainfo/ChangeLog b/media-libs/libmediainfo/ChangeLog index 73962d21ff55..f2031e843375 100644 --- a/media-libs/libmediainfo/ChangeLog +++ b/media-libs/libmediainfo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/libmediainfo # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.33 2011/11/27 04:14:12 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/ChangeLog,v 1.34 2011/11/28 03:20:05 radhermit Exp $ + + 28 Nov 2011; Tim Harder libmediainfo-0.7.51.ebuild: + Revert to autotools eclass (fixes bug #392149). 27 Nov 2011; Tim Harder libmediainfo-0.7.51.ebuild: Build in the source tree. diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest index 695849936350..65fde6476183 100644 --- a/media-libs/libmediainfo/Manifest +++ b/media-libs/libmediainfo/Manifest @@ -5,17 +5,17 @@ AUX libmediainfo-0.7.48-system-tinyxml.patch 3262 RMD160 110d8b59369009f5f41c09c DIST libmediainfo_0.7.50.tar.bz2 896072 RMD160 fb0df7545beda3b7f515729c14fb42f926f830bd SHA1 a3cae3b1ae75d60a14fc7369f922602c48254d31 SHA256 68faa49142a5a1951199d7c1d592163c23392931466749d7deb16243c1ecbdec DIST libmediainfo_0.7.51.tar.bz2 893997 RMD160 d1ce2ac37de6a33889e9baaf758e7fd27d148785 SHA1 1f74421126b2637513f2658ed9f0883de075e34b SHA256 0435f53ef07d814201eeb3478265d142264fa25205ab247398ca94617dddbaaa EBUILD libmediainfo-0.7.50.ebuild 1952 RMD160 c8183b456ff8ed7f6149d842272e0e0aad301a9e SHA1 2ee3d751e7806f4790fd352f30eaf239f369ca74 SHA256 050eab7c438bdbb0febb33abe0ed5e5589d3956ecbd49a699951be449a9cf5c8 -EBUILD libmediainfo-0.7.51.ebuild 1971 RMD160 0a78ad6385f8e198bf3355c381660c1d802b1a26 SHA1 34ac158cb1567099d8cb64a3a6c179b7aa11ff41 SHA256 e0a2a7465d7a1a4d6d54945c75be400da9f305dc3ec0ca424f4e1debf05d6e90 -MISC ChangeLog 5595 RMD160 857d0510b3bd7de9d37d4ad9c5d328c75418c5da SHA1 a80eed263729a46a89bd6e05b2430ba76cad0ea6 SHA256 be91c530dec02bbb773c0d74c88c9f20ddfde42f4a19bcad246f8b085509c2f9 +EBUILD libmediainfo-0.7.51.ebuild 1954 RMD160 3641b74169de4a30e3efb91e25403f82963be894 SHA1 30601143f37f7d7b9e83ec14bf659d9c292dfe78 SHA256 c1e1a9dcf2dd65fc082424ff0ddcb648bf4c8517f368fcf7d14577262a76199b +MISC ChangeLog 5723 RMD160 f84250d90d409d38140f4c1ac58565844356fa81 SHA1 8310d12b8286796b9ea47fbcbe2fb26e7fcefb3d SHA256 bab7288f97db8dc7c083dd172547d1db9545e2e1041228f1dd795cab9e43eeab MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJO0bkaAAoJEEqz6FtPBkyj77cH/0a0EgwfhWgrjzgZyXubkDyJ -o3QKLdQR/7Lp2XI706YBcsblHrINylaoIVWiN/4G/n3SbnLnN3BsB04WydJfAlg3 -LyDP+D5BAi5us45Yx/VimTyyR40RDTuviWZzYiHmu54r/Ul9E58d7A3WEF4QQfKp -B6z2I+pnsjpW2D8+sKE6YV4qn6dKl3a8NYUPbc6YM0ELXMc3hEFYk3NYyHgcbeuZ -ML0SdjArgz/2KjEASbE1Oc2Hc5TdX/8xLbRE0GvatUvfi5lh92DgQFQGKDZ/71u4 -wL99crACBBNXBLji01ze9Yb+YLyQxKOxVGrxuOfxPZrM1svl4o0YsKWiEnSkDJM= -=OxDI +iQEcBAEBCgAGBQJO0v3rAAoJEEqz6FtPBkyjVaAH/317RrUraQ38pTNI4xSvCcLu +r3h/XEsNpuJtnQmTL/2ecopVH7ewUqq3zwCEixTqjVEGpr2QBFxzvYh5FJsvMR41 +knJdHUm0HOsJEigO7jGbpBaO14VLDPV3Qr1qfzYthYOaPWM1jYoGT1kT+LIEZ7E4 +nH6Rwt8jb/9tCxK0QIYxSVZHSzdohjfIiSvq910/sSY/sUZMVKQD/NajT9hBrN0a +sqqeuXp29qUnI+NCjsq206syxlRliIh7Od5cfjOswlKmE2r0sVdDOi+ouK4ORREo +puXbbuxtSOxgJCcgpUiafB6+X6rnyNZKvz5kvcOboXnInG4Bfq7oH9jeq16e+v4= +=banE -----END PGP SIGNATURE----- diff --git a/media-libs/libmediainfo/libmediainfo-0.7.51.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.51.ebuild index 0dec90b4c8ac..111e2e4846f6 100644 --- a/media-libs/libmediainfo/libmediainfo-0.7.51.ebuild +++ b/media-libs/libmediainfo/libmediainfo-0.7.51.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/libmediainfo/libmediainfo-0.7.51.ebuild,v 1.2 2011/11/27 04:14:12 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.51.ebuild,v 1.3 2011/11/28 03:20:05 radhermit Exp $ EAPI="4" -inherit autotools-utils multilib flag-o-matic eutils +inherit autotools multilib flag-o-matic eutils MY_PN="MediaInfo" DESCRIPTION="MediaInfo libraries" @@ -27,8 +27,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_PN}Lib/Project/GNU/Library" -AUTOTOOLS_IN_SOURCE_BUILD=1 - src_prepare() { pushd "${WORKDIR}"/${MY_PN}Lib > /dev/null epatch "${FILESDIR}"/${PN}-0.7.48-system-tinyxml.patch @@ -79,5 +77,5 @@ src_install() { dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/* fi - remove_libtool_files all + find "${ED}" -name '*.la' -exec rm -f {} + } -- 2.26.2