From: Stefan Briesenick Date: Tue, 18 Oct 2005 19:36:57 +0000 (+0000) Subject: optimized 'use capi' handling. hopefully the last time. ;-) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=02952333241a1dc838df9a5c13e058de95d17734;p=gentoo.git optimized 'use capi' handling. hopefully the last time. ;-) Package-Manager: portage-2.0.53_rc5 --- diff --git a/app-mobilephone/yaps/ChangeLog b/app-mobilephone/yaps/ChangeLog index 51f4e1a67477..295492d73548 100644 --- a/app-mobilephone/yaps/ChangeLog +++ b/app-mobilephone/yaps/ChangeLog @@ -1,12 +1,15 @@ # ChangeLog for app-mobilephone/yaps # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.9 2005/10/17 22:24:21 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.10 2005/10/18 19:36:57 sbriesen Exp $ + + 18 Oct 2005; Stefan Briesenick yaps-0.96-r1.ebuild: + optimized 'use capi' handling. hopefully the last time. ;-) 17 Oct 2005; Stefan Briesenick yaps-0.96-r1.ebuild: removed 'use capi' from global scope. 16 Oct 2005; Stefan Briesenick yaps-0.96-r1.ebuild: - reverted x86 to ~x86. Sorry, my fault. Forget to reset keywords after fixing + reverted x86 to ~x86. Sorry, my fault. Forgot to reset keywords after fixing ebuild. 16 Oct 2005; Stefan Briesenick diff --git a/app-mobilephone/yaps/Manifest b/app-mobilephone/yaps/Manifest index 51c623558205..af5588052ae9 100644 --- a/app-mobilephone/yaps/Manifest +++ b/app-mobilephone/yaps/Manifest @@ -1,9 +1,9 @@ -MD5 b135bd2a16b7fb60a86ee5b970d18ab7 ChangeLog 1484 +MD5 81bb5889294e25ae49808b4440d48e8c ChangeLog 1624 MD5 5b713d70117b792c0fa6a519f8c0b208 files/digest-yaps-0.96 121 MD5 5b713d70117b792c0fa6a519f8c0b208 files/digest-yaps-0.96-r1 121 MD5 836bccf5ccea5152fa69261df18d3bb9 files/yaps-0.96-capiv3.patch 1820 MD5 0c53ad04e9340b9379a31756ac378afa files/yaps-0.96-gentoo.patch 10303 MD5 8cd1ba9738bbe553fc3d400dd7f7c20c files/yaps-0.96.patch 9867 MD5 28d5cc02fcd84c57b54cc995fbc506e7 metadata.xml 373 -MD5 1c88e95fe23025f256a3e0d5d008b46c yaps-0.96-r1.ebuild 1855 +MD5 d66345ee9cdef6bffee32e267dd3dc40 yaps-0.96-r1.ebuild 1737 MD5 69e77ba8276e4ac896dfb9ea0a5e385f yaps-0.96.ebuild 1705 diff --git a/app-mobilephone/yaps/yaps-0.96-r1.ebuild b/app-mobilephone/yaps/yaps-0.96-r1.ebuild index 69092d714a7f..ee898ff0e716 100644 --- a/app-mobilephone/yaps/yaps-0.96-r1.ebuild +++ b/app-mobilephone/yaps/yaps-0.96-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r1.ebuild,v 1.4 2005/10/17 22:24:21 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r1.ebuild,v 1.5 2005/10/18 19:36:57 sbriesen Exp $ inherit eutils @@ -20,15 +20,10 @@ RDEPEND="capi? ( net-dialup/capi4k-utils ) DEPEND="${RDEPEND} lua? ( dev-util/pkgconfig )" -S="${WORKDIR}" - -pkg_setup() { - use capi && MY_S="${S}/${P}.c2" || MY_S="${S}/${P}" -} - src_unpack() { unpack ${A} - cd "${MY_S}" + use capi && mv -f "${S}.c2" "${S}" + cd "${S}" # apply patches epatch "${FILESDIR}/${P}-gentoo.patch" @@ -46,16 +41,13 @@ src_unpack() { } src_compile() { - cd "${MY_S}" local myconf="" - use capi && cd "${WORKDIR}/${P}.c2" use lua && myconf="${myconf} LUA=True" use slang && myconf="${myconf} SLANG=True" emake CFLAGS="${CFLAGS}" ${myconf} || die "emake failed" } src_install() { - cd "${MY_S}" dobin yaps insinto /etc doins yaps.rc