From 28b9be940b3f60bfb61ebfa529f8b242f49f2568 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sat, 17 Mar 2012 14:27:18 -0400 Subject: [PATCH] vbetest: Misc updates. - Set EABI (current versions of portage actually refused to install this). - No point in USE=lrmi being the default anymore. - Use src_prepare function. - Fix CC setting. --- sys-apps/vbetest/Manifest | 3 +-- sys-apps/vbetest/vbetest-0.10.ebuild | 21 ++++++++------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/sys-apps/vbetest/Manifest b/sys-apps/vbetest/Manifest index 7a21ca5..de672bf 100644 --- a/sys-apps/vbetest/Manifest +++ b/sys-apps/vbetest/Manifest @@ -1,5 +1,4 @@ AUX vbetest-libx86.patch 666 RMD160 fd76f2a1825dc1d9c14c0db256da5c6ecd890d38 SHA1 5107f405c9b835bc419d1765b3f3b3716509e718 SHA256 78bca3120cb814f9aba09d079abe5fba673c3214e2faa3f1a748c026f7e99d4e AUX vbetest-sharedlrmi.patch 414 RMD160 f2be81deb3189530862898399849791a62285ec3 SHA1 9716cf9655a5b7f6c40f3a91e13216a9cca40666 SHA256 4994414af5c9aa4dfd38ea31df9676b16d6970ec5cdad73b044a637c5ab1d128 DIST lrmi-0.10.tar.gz 10271 RMD160 3805b41fd2a558ec145991c30a7f88101af48f1c SHA1 1495b3c2f3613979eb0396fd99a8e5e52d53ec80 SHA256 b0be55c14407f586dc10836e8f348b3a002c461a9b47a302071eac0ef85770da -EBUILD vbetest-0.10.ebuild 751 RMD160 6e3021dc02fc9e95f47b64aac7db665a51fc3e13 SHA1 b65ba047754d00d7da0f099c07b37b7766593b23 SHA256 b2bdee90e19235a674c792a3e8882c192d41c52ded5801e6b066543f75744f86 -MISC vbetest-0.10.ebuild~ 664 RMD160 faf1e06327ecdf7b088164bcd7b92e58cbc93f51 SHA1 6174ebafce867f0cb7ee1a5771812cacd97ed19a SHA256 c7c037a4c524e8d0a556cefcec385a0c830a9a3b70c4ef2909e62a1d348b4c9d +EBUILD vbetest-0.10.ebuild 636 RMD160 17f2b01229e2fb87cac212503281bb98202f8a8f SHA1 41a446ecb1bbee13ca81ef590cdadb6e2b1b6007 SHA256 5e0c423ddeb6575e72bc21d9cff5cb14882884d532b27530240a2a6149bcfaf8 diff --git a/sys-apps/vbetest/vbetest-0.10.ebuild b/sys-apps/vbetest/vbetest-0.10.ebuild index 9e5b7ca..a589c22 100644 --- a/sys-apps/vbetest/vbetest-0.10.ebuild +++ b/sys-apps/vbetest/vbetest-0.10.ebuild @@ -1,8 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ +EAPI=4 -inherit eutils +inherit eutils toolchain-funcs S="${WORKDIR}/lrmi-${PV}" @@ -13,26 +11,23 @@ SRC_URI="mirror://sourceforge/lrmi/lrmi-${PV}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~x86 ~amd64" -IUSE="+lrmi" +IUSE="lrmi" DEPEND="lrmi? ( =sys-libs/lrmi-${PV}* ) !lrmi? ( dev-libs/libx86 )" -src_unpack() { - unpack "${A}" - cd "${S}" - +src_prepare() { if ! use lrmi ; then - epatch "${FILESDIR}/${PN}-libx86.patch" + epatch "${FILESDIR}/${PN}-libx86.patch" || die else - epatch "${FILESDIR}/${PN}-sharedlrmi.patch" + epatch "${FILESDIR}/${PN}-sharedlrmi.patch" || die fi } src_compile() { - emake CFLAGS="${CFLAGS}" vbetest || die + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" vbetest } src_install() { - dobin vbetest || die "dobin" + dobin vbetest } -- 2.43.0