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 | c8542c0123aa1a9bc45817a82faf678964813a79 (patch) | |
| tree | 1a99c627ca4e34dc6f200034e031fc6ab8a7ddcb /gnustep-libs | |
| parent | Add mirror restriction (coordinated with Alessio). (diff) | |
| download | historical-c8542c0123aa1a9bc45817a82faf678964813a79.tar.gz historical-c8542c0123aa1a9bc45817a82faf678964813a79.tar.bz2 historical-c8542c0123aa1a9bc45817a82faf678964813a79.zip | |
Fix compilation with gdl2, bug #274360
Package-Manager: portage-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/Manifest | 5 | ||||
| -rw-r--r-- | gnustep-libs/steptalk/metadata.xml | 3 | ||||
| -rw-r--r-- | gnustep-libs/steptalk/steptalk-0.10.0-r2.ebuild | 44 |
4 files changed, 58 insertions, 4 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/Manifest b/gnustep-libs/steptalk/Manifest index e17274d23992..7b16795acd3e 100644 --- a/gnustep-libs/steptalk/Manifest +++ b/gnustep-libs/steptalk/Manifest @@ -1,5 +1,6 @@ AUX steptalk-0.10.0-gnustep-make-2.patch 7383 RMD160 62759239e2c088daf3f75cb06d02e810bbadf110 SHA1 c7433b07960fbe1fe8217b7cd3ef3d5c43796543 SHA256 12a0b0a69d9e95794d5ebddd4b261c72111733ed16bece8191db0a1221091b48 DIST StepTalk-0.10.0.tar.gz 307139 RMD160 02a85d4063b0a40b4ba546185de44c834ca4364c SHA1 bf330dc51fbdd3b4243f7601e1fb9cf6562f2f9f SHA256 91fda97d104b3d4b3ceb2f78408f5a57abe26dd59f5cf57ad528a1e36edfc115 EBUILD steptalk-0.10.0-r1.ebuild 849 RMD160 2a73e309ac565670e1de9b4197c1bfe584dc1756 SHA1 566d06b8c6815455265439e8ca9a8a97c044cbdd SHA256 c2cb771cea3c3156bef39d0d07f7a2f1e2c82c3df02973012e9f4064618dc6d0 -MISC ChangeLog 3306 RMD160 1e22e06ffcdc0f7b3a458cf84846d9a5daa389e5 SHA1 4b43e07e99e94b154c3ef76267c6e020a443616a SHA256 8708911a45085d3c2df375aee00ec30a91d75faf187153b0377ddfeae7633083 -MISC metadata.xml 2189 RMD160 aaaf6f8943ffd9efea03535c764135999311432f SHA1 0444896f36817a2037e5a486a8b3bb36a4cb5c1f SHA256 25fdd2c0e385ec133d1eb2e69865364816a23e307a79269a4cb6e14f00abebb7 +EBUILD steptalk-0.10.0-r2.ebuild 1240 RMD160 66f0670a1a0f918ef528290b1c53c08b39a127b6 SHA1 be48d18c83917f1e869fd5e2b139afa8a66d68aa SHA256 836f10f074f800a77e11eb477d564f507a08ffdcc24dcbe30d8b4c54c478bd68 +MISC ChangeLog 3482 RMD160 0b27031fee3fd9d71f08dc2cf2cc2c4ae6d15c55 SHA1 fb26cba41b49f6b1263b337cc86a3a514c6c2b5f SHA256 c2b38d10b241116ca7a75d314f53dd88e620353524837e6d726b6b7bb8cc44b4 +MISC metadata.xml 2276 RMD160 70888c0271de53a2e40996d2dc12b94be6bd208b SHA1 4f4a870ae1d7aed8a8dd8b600a3aed364f055844 SHA256 0c235baff0885c9b84a2b9c270c3e5f5075a267e8f00258aa1ccd3d3b5cdc971 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 +} |