From 0fbfeab93796d1c54d3f087439d6c1c4d965be47 Mon Sep 17 00:00:00 2001 From: George Shapovalov Date: Fri, 27 Oct 2006 20:59:14 +0000 Subject: [PATCH] fixed the prestripping issue (#152259), cleaned up src_unpack, adjusted DEPEND for modular X. Package-Manager: portage-2.1.2_pre3-r9 --- app-misc/astrolog/ChangeLog | 9 ++++++-- app-misc/astrolog/Manifest | 18 ++++++++++++--- app-misc/astrolog/astrolog-5.40.ebuild | 24 +++++++++++--------- app-misc/astrolog/files/digest-astrolog-5.40 | 2 ++ 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/app-misc/astrolog/ChangeLog b/app-misc/astrolog/ChangeLog index 88246eb1b2d8..e183d85be2de 100644 --- a/app-misc/astrolog/ChangeLog +++ b/app-misc/astrolog/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/astrolog -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/ChangeLog,v 1.9 2005/11/07 12:03:20 george Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/ChangeLog,v 1.10 2006/10/27 20:59:14 george Exp $ + + 27 Oct 2006; George Shapovalov astrolog-5.40.ebuild: + fixed the prestripping issue (#152259). Cleaned up src_unpack (removed + unnecessary seds), adjusted DEPEND so that it plays nicely with the modular + X. 07 Nov 2005; George Shapovalov astrolog-5.40.ebuild: fixed missing DEPEND on (optional) X (#109227) diff --git a/app-misc/astrolog/Manifest b/app-misc/astrolog/Manifest index 12cdf7d32240..009299a0297e 100644 --- a/app-misc/astrolog/Manifest +++ b/app-misc/astrolog/Manifest @@ -1,4 +1,16 @@ -MD5 07d48e983383e5c5b38745b6e1b94b28 ChangeLog 927 -MD5 af61f6bb840bfaf9278db76926afcfb6 astrolog-5.40.ebuild 2021 -MD5 d6e3d805e13b735f1bc9665ccd43e858 files/digest-astrolog-5.40 58 +DIST ast54unx.shr 1465432 RMD160 4714490507ab673be707d0e09ff965012cd6c3ca SHA1 8511f7cdee0a559779f30d838e55e44585775840 SHA256 6700d393a421c16076d1aad37f171fde6293f1c062ec6a6ee07a884182287736 +EBUILD astrolog-5.40.ebuild 2107 RMD160 425763e2753a3c0a2c2c0e1626fb8191b5c6da08 SHA1 b0f01d782f45041de7e7ecbced705a7e35ebed0b SHA256 cf5c48a2c7c6c9fd3d2d70b3f6e248801cb085df7430b44ad777c6529798dd7c +MD5 b1fee944536de5e1f267a991c64c72d6 astrolog-5.40.ebuild 2107 +RMD160 425763e2753a3c0a2c2c0e1626fb8191b5c6da08 astrolog-5.40.ebuild 2107 +SHA256 cf5c48a2c7c6c9fd3d2d70b3f6e248801cb085df7430b44ad777c6529798dd7c astrolog-5.40.ebuild 2107 +MISC ChangeLog 1160 RMD160 9f89b1e27ad7b9e637e1ca6faad03cfc579e3a3b SHA1 38453872b686c85ca348442d46b02372ceb396f1 SHA256 e44b62525db01a96c34ae01503556cb6cdc1d8f8b6db8bf729dd3a936833f612 +MD5 c74a09b6204d0828f92638ea6bf39c54 ChangeLog 1160 +RMD160 9f89b1e27ad7b9e637e1ca6faad03cfc579e3a3b ChangeLog 1160 +SHA256 e44b62525db01a96c34ae01503556cb6cdc1d8f8b6db8bf729dd3a936833f612 ChangeLog 1160 +MISC metadata.xml 408 RMD160 e2b9c72b8bf8f4a796b7cee6f4a2d333a95f7cf1 SHA1 71aee6db4caf0f84f0d9e3faa3d11eb1e3a84c89 SHA256 5a385b482245c60322c6e546f993bd7b79d66c6087f8449bdd1ae78c8f45afba MD5 b6ac40cfdd9adfabf7d803ccf47865f1 metadata.xml 408 +RMD160 e2b9c72b8bf8f4a796b7cee6f4a2d333a95f7cf1 metadata.xml 408 +SHA256 5a385b482245c60322c6e546f993bd7b79d66c6087f8449bdd1ae78c8f45afba metadata.xml 408 +MD5 30d9a6554c5d41318f090e088e96d61b files/digest-astrolog-5.40 220 +RMD160 e84ec003513184c92559686f2d9f91d7a0980b21 files/digest-astrolog-5.40 220 +SHA256 9a780d4a61857708f58e35ef86814acc74718cd9c55ca5e2b60da7fbfb7b05cc files/digest-astrolog-5.40 220 diff --git a/app-misc/astrolog/astrolog-5.40.ebuild b/app-misc/astrolog/astrolog-5.40.ebuild index bb07c6594dc7..75e9c1035b6f 100644 --- a/app-misc/astrolog/astrolog-5.40.ebuild +++ b/app-misc/astrolog/astrolog-5.40.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 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.9 2005/11/07 12:03:20 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/astrolog-5.40.ebuild,v 1.10 2006/10/27 20:59:14 george Exp $ DESCRIPTION="A many featured astrology chart calculation program" HOMEPAGE="http://www.astrolog.org/astrolog.htm" @@ -13,14 +13,22 @@ KEYWORDS="x86 ppc64 ppc amd64" IUSE="X" -DEPEND="X? ( x11-base/xorg-x11 )" +DEPEND="X? ( || ( x11-libs/libX11 virtual/x11 ) )" S="${WORKDIR}" src_unpack() { bash ${DISTDIR}/ast54unx.shr + cd ${S} + + # remove stripping of created binary and substituce CFLAGS + sed -i -e "s:strip:#strip:" -e "s:= -O:= ${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 + # if we use X, we need to add -L/usr/X11R6/lib to compile succesful - use X && sed -i -e "s:-lm -lX11:-lm -lX11 -L/usr/X11R6/lib:g" Makefile + #use X && sed -i -e "s:-lm -lX11:-lm -lX11 -L/usr/X11R6/lib:g" Makefile # if we do NOT use X, we disable it by removing the -lX11 from the Makefile # and remove the "#define X11" and "#define MOUSE" from astrolog.h @@ -28,14 +36,8 @@ src_unpack() { sed -i -e "s:#define X11:/*#define X11:g" astrolog.h sed -i -e "s:#define MOUSE:/*#define MOUSE:g" astrolog.h ) - # we use /usr/share/astrolog for config and (optional) ephemeris-data-files - sed -i -e "s:~/astrolog:/usr/share/astrolog:g" astrolog.h - # any user may have an own astrolog configfile - sed -i -e "s:astrolog.dat:astrolog.dat:g" astrolog.h - - # include users CFLAGS - sed -i -e "s:= -O:= ${CFLAGS}":g Makefile + #sed -i -e "s:astrolog.dat:astrolog.dat:g" astrolog.h } src_compile() { diff --git a/app-misc/astrolog/files/digest-astrolog-5.40 b/app-misc/astrolog/files/digest-astrolog-5.40 index be4ada6a84d5..d3dc034f9294 100644 --- a/app-misc/astrolog/files/digest-astrolog-5.40 +++ b/app-misc/astrolog/files/digest-astrolog-5.40 @@ -1 +1,3 @@ MD5 3d604e013d8a7e2134bc637f17bb2857 ast54unx.shr 1465432 +RMD160 4714490507ab673be707d0e09ff965012cd6c3ca ast54unx.shr 1465432 +SHA256 6700d393a421c16076d1aad37f171fde6293f1c062ec6a6ee07a884182287736 ast54unx.shr 1465432 -- 2.26.2