summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Briesenick <sbriesen@gentoo.org>2005-10-17 22:24:21 +0000
committerStefan Briesenick <sbriesen@gentoo.org>2005-10-17 22:24:21 +0000
commit69c4eea86e44949d2b35d1581926b9618003201f (patch)
tree8aef93739459ba61a3dae88fe3a923691398aa8f /app-mobilephone
parentVersion bump. (diff)
downloadgentoo-2-69c4eea86e44949d2b35d1581926b9618003201f.tar.gz
gentoo-2-69c4eea86e44949d2b35d1581926b9618003201f.tar.bz2
gentoo-2-69c4eea86e44949d2b35d1581926b9618003201f.zip
removed 'use capi' from global scope.
(Portage version: 2.0.53_rc5)
Diffstat (limited to 'app-mobilephone')
-rw-r--r--app-mobilephone/yaps/ChangeLog5
-rw-r--r--app-mobilephone/yaps/Manifest2
-rw-r--r--app-mobilephone/yaps/yaps-0.96-r1.ebuild13
3 files changed, 15 insertions, 5 deletions
diff --git a/app-mobilephone/yaps/ChangeLog b/app-mobilephone/yaps/ChangeLog
index 5e4ba55fdfcc..51f4e1a67477 100644
--- a/app-mobilephone/yaps/ChangeLog
+++ b/app-mobilephone/yaps/ChangeLog
@@ -1,6 +1,9 @@
# 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.8 2005/10/16 16:41:22 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/ChangeLog,v 1.9 2005/10/17 22:24:21 sbriesen Exp $
+
+ 17 Oct 2005; Stefan Briesenick <sbriesen@gentoo.org> yaps-0.96-r1.ebuild:
+ removed 'use capi' from global scope.
16 Oct 2005; Stefan Briesenick <sbriesen@gentoo.org> yaps-0.96-r1.ebuild:
reverted x86 to ~x86. Sorry, my fault. Forget to reset keywords after fixing
diff --git a/app-mobilephone/yaps/Manifest b/app-mobilephone/yaps/Manifest
index c47da3d482eb..1dd0d308d5ff 100644
--- a/app-mobilephone/yaps/Manifest
+++ b/app-mobilephone/yaps/Manifest
@@ -5,5 +5,5 @@ 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 fc2c2424c27748dcd9802e6f887ab9c5 yaps-0.96-r1.ebuild 1726
+MD5 7c0c9f779388552803dcf7646d54a4ae yaps-0.96-r1.ebuild 1855
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 a5cd806752dc..69092d714a7f 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.3 2005/10/16 16:41:22 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r1.ebuild,v 1.4 2005/10/17 22:24:21 sbriesen Exp $
inherit eutils
@@ -20,11 +20,15 @@ RDEPEND="capi? ( net-dialup/capi4k-utils )
DEPEND="${RDEPEND}
lua? ( dev-util/pkgconfig )"
-use capi && S="${S}.c2"
+S="${WORKDIR}"
+
+pkg_setup() {
+ use capi && MY_S="${S}/${P}.c2" || MY_S="${S}/${P}"
+}
src_unpack() {
unpack ${A}
- cd "${S}"
+ cd "${MY_S}"
# apply patches
epatch "${FILESDIR}/${P}-gentoo.patch"
@@ -42,13 +46,16 @@ 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