From 74896acf90666daffca4cf40d72f93d70a0d80c6 Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Thu, 4 Jan 2007 16:25:03 +0000 Subject: [PATCH] Correctly use eautoreconf, WANT_AUTO*, thanks to Flameeyes. Guess gcc-version to use. Package-Manager: portage-2.1.2_rc4-r5 --- media-video/mp1e/ChangeLog | 9 +++++-- media-video/mp1e/Manifest | 24 ++++++++--------- media-video/mp1e/mp1e-0.5.2.20040909.ebuild | 29 ++++++++++++++------- 3 files changed, 38 insertions(+), 24 deletions(-) diff --git a/media-video/mp1e/ChangeLog b/media-video/mp1e/ChangeLog index 8267b713cefa..5c749b6b417f 100644 --- a/media-video/mp1e/ChangeLog +++ b/media-video/mp1e/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/mp1e -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mp1e/ChangeLog,v 1.2 2006/10/25 09:05:11 zzam Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/mp1e/ChangeLog,v 1.3 2007/01/04 16:25:03 zzam Exp $ + + 04 Jan 2007; Matthias Schwarzott + mp1e-0.5.2.20040909.ebuild: + Correctly use eautoreconf, WANT_AUTO*, thanks to Flameeyes. Guess + gcc-version to use. 25 Oct 2006; Matthias Schwarzott mp1e-0.5.2.20040909.ebuild: diff --git a/media-video/mp1e/Manifest b/media-video/mp1e/Manifest index e464fb4c920b..74242ee15391 100644 --- a/media-video/mp1e/Manifest +++ b/media-video/mp1e/Manifest @@ -3,14 +3,14 @@ Hash: SHA1 DIST rte-09sep04-mp1e-gentoo.patch 47530 RMD160 310214a1fab00704f7f161827b7317d2589825be SHA1 763b8bd423d49911b1747aab5f18ed29185b5c59 SHA256 ce0883c6f63d1bffe1005b8aaa606299621507d9b66051ee3407e9bd856ed7b5 DIST rte-09sep04.tar.bz2 445379 RMD160 5f1260d56d7e7a439f0fece3afef4964aa4099c4 SHA1 65a27e3b0c29a7d551a371d23ae8645ffe8fdc50 SHA256 e324523f34adb3e4e074e592237fee795b12f54210e0cee09b2eda5910cfd921 -EBUILD mp1e-0.5.2.20040909.ebuild 1194 RMD160 66dde2ee033345480547e1e3935fffe097092fe8 SHA1 1c5b733531b3d37dd638e54d431ca061beb0d6d3 SHA256 b5c9b2e7a89ec83f32f7bf8f2d34c0ccd470724436e840a0aeca6d04fcf1a5f5 -MD5 0fe9c1d2447453918eb43a77538c81b7 mp1e-0.5.2.20040909.ebuild 1194 -RMD160 66dde2ee033345480547e1e3935fffe097092fe8 mp1e-0.5.2.20040909.ebuild 1194 -SHA256 b5c9b2e7a89ec83f32f7bf8f2d34c0ccd470724436e840a0aeca6d04fcf1a5f5 mp1e-0.5.2.20040909.ebuild 1194 -MISC ChangeLog 516 RMD160 9a645b6a0b4becf142b438b99685190f300e206d SHA1 5fd79b506aa9f86c55cf9b71d7739d155196efcd SHA256 9ba0d2723eef6c1d47c5ac9b462c910eca133c3df5a3256e41a7a18b2eca0990 -MD5 7f44bcf1f5f78ca818926f32dcc74bb7 ChangeLog 516 -RMD160 9a645b6a0b4becf142b438b99685190f300e206d ChangeLog 516 -SHA256 9ba0d2723eef6c1d47c5ac9b462c910eca133c3df5a3256e41a7a18b2eca0990 ChangeLog 516 +EBUILD mp1e-0.5.2.20040909.ebuild 1449 RMD160 a34f26082080cb0dd289262ab492d35db5b375db SHA1 46e74e94530f6fe75f38a50622c0fff93f9d417d SHA256 f6c90f3ceec2acd3b0c3499508ec3913844be92850ad49accfc02017bb6ecc27 +MD5 07b1574c33ee2d250276e6c6e47ee346 mp1e-0.5.2.20040909.ebuild 1449 +RMD160 a34f26082080cb0dd289262ab492d35db5b375db mp1e-0.5.2.20040909.ebuild 1449 +SHA256 f6c90f3ceec2acd3b0c3499508ec3913844be92850ad49accfc02017bb6ecc27 mp1e-0.5.2.20040909.ebuild 1449 +MISC ChangeLog 690 RMD160 f137587666f744c2225eee76dfca3d5a085fcd4c SHA1 4fe7dc509d7ce2bd9ca7393c1c7a93a5d3c3307d SHA256 9884a795d119b32547154a026e9e36bdc0d85a2a1a4ad4115c8ab235a4fc6c5b +MD5 32a8a0b0a2fc74ab094b2f37065918d2 ChangeLog 690 +RMD160 f137587666f744c2225eee76dfca3d5a085fcd4c ChangeLog 690 +SHA256 9884a795d119b32547154a026e9e36bdc0d85a2a1a4ad4115c8ab235a4fc6c5b ChangeLog 690 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298 @@ -19,9 +19,9 @@ MD5 37a4eb71a30616547c621fe0f2c322dd files/digest-mp1e-0.5.2.20040909 503 RMD160 06a0b1884fdf67cf257bf2ace319cd074e7f0145 files/digest-mp1e-0.5.2.20040909 503 SHA256 62c631f75b9e9b2d00273e525339b07b1425ac4184c0ce877d6f9994da52a359 files/digest-mp1e-0.5.2.20040909 503 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFPyjSt2vP6XvVdOcRAtVJAKCNqhtDCSkKN4frG5JiVcVZzZnxhACgn4HB -dKP3SMCTHhEndA9/VebRanc= -=8fPo +iD8DBQFFnSpmt2vP6XvVdOcRAvfuAKDMtIa8b4IK5bzt4QRPANToKVxxvwCg0dPm +akPmsb+RdXczbTdNzlT4SKc= +=sfJo -----END PGP SIGNATURE----- diff --git a/media-video/mp1e/mp1e-0.5.2.20040909.ebuild b/media-video/mp1e/mp1e-0.5.2.20040909.ebuild index 943ff27d04d4..6f90ba600710 100644 --- a/media-video/mp1e/mp1e-0.5.2.20040909.ebuild +++ b/media-video/mp1e/mp1e-0.5.2.20040909.ebuild @@ -1,8 +1,11 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mp1e/mp1e-0.5.2.20040909.ebuild,v 1.2 2006/10/25 09:05:11 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mp1e/mp1e-0.5.2.20040909.ebuild,v 1.3 2007/01/04 16:25:03 zzam Exp $ -inherit eutils toolchain-funcs +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" + +inherit eutils toolchain-funcs autotools MY_P=rte-09sep04 @@ -24,7 +27,18 @@ S=${WORKDIR}/${MY_P}/mp1e pkg_setup() { if [ "$(gcc-major-version)" == "4" ]; then eerror "this mp1e-version requires gcc-3 in order to build correctly" - eerror "please compile it with gcc-3" + + # Search gcc-3 + local MY_GCC=$(ls -1 /usr/bin/gcc-3.*|sort -r|head -1) + MY_GCC=${MY_GCC##*/} + + if [[ -n ${MY_GCC} ]]; then + eerror "please compile it using:" + eerror "\tCC=${MY_GCC} emerge mp1e" + else + eerror "please install a gcc-3.* and try using it for ${PN}:" + eerror "\temerge =gcc-3*" + fi die "gcc 4 cannot build this mp1e-version" fi } @@ -35,13 +49,8 @@ src_unpack() { cd ${S} einfo "Applying vdr-analogtv patch:" epatch ${DISTDIR}/${MY_P}-mp1e-gentoo.patch -} - -src_compile() { - libtoolize --copy --force - econf || die "econf failed" - emake || die "emake failed" + AT_M4DIR="macros" eautoreconf } src_install() { -- 2.26.2