summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2010-01-11 16:41:19 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2010-01-11 16:41:19 +0000
commitd967884321dfffd5b9b8e16a8779df59c4054168 (patch)
tree9e4b0c812749028098469970760413d7c5df32c3 /app-misc/astrolog
parentforget to actually check user USE settings (diff)
downloadhistorical-d967884321dfffd5b9b8e16a8779df59c4054168.tar.gz
historical-d967884321dfffd5b9b8e16a8779df59c4054168.tar.bz2
historical-d967884321dfffd5b9b8e16a8779df59c4054168.zip
Fixed propagation of compiler, bug #243606, thanks Arttu Valo
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'app-misc/astrolog')
-rw-r--r--app-misc/astrolog/ChangeLog8
-rw-r--r--app-misc/astrolog/Manifest14
-rw-r--r--app-misc/astrolog/astrolog-5.40.ebuild24
3 files changed, 34 insertions, 12 deletions
diff --git a/app-misc/astrolog/ChangeLog b/app-misc/astrolog/ChangeLog
index 82566e6eb7f6..97421e2640a1 100644
--- a/app-misc/astrolog/ChangeLog
+++ b/app-misc/astrolog/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/astrolog
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/ChangeLog,v 1.11 2007/07/22 10:06:45 omp Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/ChangeLog,v 1.12 2010/01/11 16:41:19 bicatali Exp $
+
+ 11 Jan 2010; SĂ©bastien Fabbro <bicatali@gentoo.org> astrolog-5.40.ebuild:
+ Fixed propagation of compiler, bug #243606, thanks Arttu Valo
+
22 Jul 2007; David Shakaryan <omp@gentoo.org> astrolog-5.40.ebuild:
Remove virtual/x11 from dependencies.
diff --git a/app-misc/astrolog/Manifest b/app-misc/astrolog/Manifest
index f3cc8138a87e..d9039845d356 100644
--- a/app-misc/astrolog/Manifest
+++ b/app-misc/astrolog/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST ast54unx.shr 1465432 RMD160 4714490507ab673be707d0e09ff965012cd6c3ca SHA1 8511f7cdee0a559779f30d838e55e44585775840 SHA256 6700d393a421c16076d1aad37f171fde6293f1c062ec6a6ee07a884182287736
-EBUILD astrolog-5.40.ebuild 1995 RMD160 73ca22fdd728f1439f924a894706b4750529065f SHA1 723bad8b2440a11e63ec2a00c1e53e8868be1293 SHA256 b0f4f182a077da36d289b9eb6da652f7a3f1dbc82d0e4341d4b8caaa8534fc33
-MISC ChangeLog 1268 RMD160 5c1d02d93459f438b595e985fadb85ab756bbf8d SHA1 6632c2e6439cf7738c09277aa1a46a4439acdd43 SHA256 34ae89a9c9c8830351777add08d5fe89007b8dbf8ac2b24e68d47db254f8b03c
+EBUILD astrolog-5.40.ebuild 2184 RMD160 71bebdd6c9002abb0cc0dc19274da4df70073400 SHA1 572b8df4071d7263af7c2cfc02535a21c26b0b25 SHA256 6bc5381cdb49b25545e9e2c9c13dac40792d970864d04729341f4a3d85cc7b6b
+MISC ChangeLog 1417 RMD160 840ec3e0bee95b9b215185279ccd4a467d0c4dec SHA1 c7baf84ec7ca55f181c3e8def1533480c6f45fb2 SHA256 5e5340381b93e2cdc764169067444b1383b026798512f7951c642696cdca1565
MISC metadata.xml 408 RMD160 e2b9c72b8bf8f4a796b7cee6f4a2d333a95f7cf1 SHA1 71aee6db4caf0f84f0d9e3faa3d11eb1e3a84c89 SHA256 5a385b482245c60322c6e546f993bd7b79d66c6087f8449bdd1ae78c8f45afba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktLXU0ACgkQ1ycZbhPLE2BrDwCcDVNKrpUwE0KqrnXEofn83T58
+jUwAnAhR2z+s7G31LJ82z/UlUHhOrvUK
+=kZw5
+-----END PGP SIGNATURE-----
diff --git a/app-misc/astrolog/astrolog-5.40.ebuild b/app-misc/astrolog/astrolog-5.40.ebuild
index a454861f4444..96ef16c7e462 100644
--- a/app-misc/astrolog/astrolog-5.40.ebuild
+++ b/app-misc/astrolog/astrolog-5.40.ebuild
@@ -1,6 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/astrolog-5.40.ebuild,v 1.13 2010/01/01 17:56:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/astrolog-5.40.ebuild,v 1.14 2010/01/11 16:41:19 bicatali Exp $
+
+EAPI=2
+
+inherit toolchain-funcs
DESCRIPTION="A many featured astrology chart calculation program"
HOMEPAGE="http://www.astrolog.org/astrolog.htm"
@@ -8,19 +12,23 @@ SRC_URI="http://www.astrolog.org/ftp/ast54unx.shr"
LICENSE="astrolog"
SLOT="0"
-KEYWORDS="x86 ppc64 ppc amd64"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="X"
DEPEND="X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
-S=${WORKDIR}
+S="${WORKDIR}"
src_unpack() {
- bash "${DISTDIR}"/ast54unx.shr
- cd "${S}"
+ sh "${DISTDIR}"/ast54unx.shr
+}
- # remove stripping of created binary and substituce CFLAGS
- sed -i -e "s:strip:#strip:" -e "s:= -O:= ${CFLAGS}:" Makefile
+src_prepare() {
+ # remove stripping of created binary, dump hardcoded CFLAGS,
+ # respect CC (bug #243606), and CFLAGS (bug #240057)
+ sed -i -e 's:strip:#strip:' -e 's:^CFLAGS = :#CFLAGS = :' \
+ -e 's:\tcc :\t$(CC) $(CFLAGS) :' Makefile
# we use /usr/share/astrolog for config and (optional) ephemeris-data-files
sed -i -e "s:~/astrolog:/usr/share/astrolog:g" astrolog.h
@@ -39,7 +47,7 @@ src_unpack() {
}
src_compile() {
- emake || die
+ emake CC="$(tc-getCC)" || die "emake failed"
}
src_install() {