diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2009-07-27 20:19:41 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2009-07-27 20:19:41 +0000 |
| commit | 41a86d94a5ae3e9cf58d6c33ca92b0535b040e38 (patch) | |
| tree | 5c12c637bc6cd64bfd2230490a9b58ecd03c17e7 /gnustep-libs | |
| parent | Add mirror restriction (coordinated with Alessio). (diff) | |
| download | gentoo-2-41a86d94a5ae3e9cf58d6c33ca92b0535b040e38.tar.gz gentoo-2-41a86d94a5ae3e9cf58d6c33ca92b0535b040e38.tar.bz2 gentoo-2-41a86d94a5ae3e9cf58d6c33ca92b0535b040e38.zip | |
Fix compilation with gdl2, bug #274360
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'gnustep-libs')
| -rw-r--r-- | gnustep-libs/steptalk/ChangeLog | 10 | ||||
| -rw-r--r-- | gnustep-libs/steptalk/metadata.xml | 3 | ||||
| -rw-r--r-- | gnustep-libs/steptalk/steptalk-0.10.0-r2.ebuild | 44 |
3 files changed, 55 insertions, 2 deletions
diff --git a/gnustep-libs/steptalk/ChangeLog b/gnustep-libs/steptalk/ChangeLog index 21f12effc175..a197909866f5 100644 --- a/gnustep-libs/steptalk/ChangeLog +++ b/gnustep-libs/steptalk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnustep-libs/steptalk -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/steptalk/ChangeLog,v 1.15 2008/03/08 13:18:39 coldwind Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/steptalk/ChangeLog,v 1.16 2009/07/27 20:19:41 voyageur Exp $ + +*steptalk-0.10.0-r2 (27 Jul 2009) + + 27 Jul 2009; Bernard Cafarelli <voyageur@gentoo.org> + +steptalk-0.10.0-r2.ebuild, metadata.xml: + Fix compilation with gdl2, bug #274360 08 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> steptalk-0.10.0-r1.ebuild: diff --git a/gnustep-libs/steptalk/metadata.xml b/gnustep-libs/steptalk/metadata.xml index 48313ce23bc8..413d2cc28ac7 100644 --- a/gnustep-libs/steptalk/metadata.xml +++ b/gnustep-libs/steptalk/metadata.xml @@ -35,4 +35,7 @@ Tools stexec - execute scripts in GNUstep environment stalk - tool for talking to the GNUstep servers and applications </longdescription> +<use> + <flag name='gdl2'>Compile module for <pkg>gnustep-libs/gdl2</pkg></flag> +</use> </pkgmetadata> diff --git a/gnustep-libs/steptalk/steptalk-0.10.0-r2.ebuild b/gnustep-libs/steptalk/steptalk-0.10.0-r2.ebuild new file mode 100644 index 000000000000..a2604fa66f8a --- /dev/null +++ b/gnustep-libs/steptalk/steptalk-0.10.0-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/steptalk/steptalk-0.10.0-r2.ebuild,v 1.1 2009/07/27 20:19:41 voyageur Exp $ + +EAPI=2 +inherit gnustep-2 + +MY_PN="StepTalk" +DESCRIPTION="StepTalk is the official GNUstep scripting framework." +HOMEPAGE="http://www.gnustep.org/experience/StepTalk.html" +SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/libs/${MY_PN}-${PV}.tar.gz" + +KEYWORDS="~amd64 ~ppc ~x86" +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="gdl2" + +DEPEND="gdl2? ( >=gnustep-libs/gdl2-0.11.0 )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_PN}" + +src_prepare() { + epatch "${FILESDIR}/${P}-gnustep-make-2.patch" + if use gdl2; then + # These libraries do not exist anymore + sed -i -e "s/-lgnustep-db2 -lgnustep-db2control -lgnustep-db2modeler//" \ + Modules/GDL2/GNUmakefile || die "gdl2 compilation sed failed" + else + # Do not try to compile the module + sed -i -e "s/GDL2//" Modules/GNUmakefile || die "gdl2 disabling sed failed" + fi + +} + +src_install() { + gnustep-base_src_install + + if use doc ; then + egnustep_env + mkdir -p "${D}"${GNUSTEP_SYSTEM_DOC}/Developer/${MY_PN} + cp -R Documentation/* "${D}"${GNUSTEP_SYSTEM_DOC}/Developer/${MY_PN} + fi +} |