app-misc/astrolog: Drop old; respect LDFLAGS , #336971; thanks Michael Mair-Keimberger (iamnr3) for the patch

(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

4 files changed, 31 insertions, 22 deletions

diff --git a/app-misc/astrolog/ChangeLog b/app-misc/astrolog/ChangeLog
index e7e6522e3ae9..0f3f787bb652 100644
--- a/app-misc/astrolog/ChangeLog
+++ b/app-misc/astrolog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/astrolog
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/ChangeLog,v 1.15 2012/06/08 11:53:40 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/ChangeLog,v 1.16 2013/03/27 19:13:57 jlec Exp $
+
+*astrolog-5.40-r2 (27 Mar 2013)
+
+  27 Mar 2013; Justin Lecher <jlec@gentoo.org> -astrolog-5.40.ebuild,
+  astrolog-5.40-r1.ebuild, +astrolog-5.40-r2.ebuild, metadata.xml:
+  Drop old; respect LDFLAGS , #336971; thanks Michael Mair-Keimberger (iamnr3)
+  for the patch
 
   08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> astrolog-5.40-r1.ebuild:
   x86 stable wrt bug #418597
diff --git a/app-misc/astrolog/astrolog-5.40-r1.ebuild b/app-misc/astrolog/astrolog-5.40-r1.ebuild
index 14c8ff2feee2..c04677fdfd53 100644
--- a/app-misc/astrolog/astrolog-5.40-r1.ebuild
+++ b/app-misc/astrolog/astrolog-5.40-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/astrolog-5.40-r1.ebuild,v 1.3 2012/06/08 11:53:40 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/astrolog-5.40-r1.ebuild,v 1.4 2013/03/27 19:13:57 jlec Exp $
 
 EAPI=4
 
@@ -49,7 +49,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-misc/astrolog/astrolog-5.40.ebuild b/app-misc/astrolog/astrolog-5.40-r2.ebuild
index 96ef16c7e462..63ffdee97027 100644
--- a/app-misc/astrolog/astrolog-5.40.ebuild
+++ b/app-misc/astrolog/astrolog-5.40-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 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.14 2010/01/11 16:41:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/astrolog/astrolog-5.40-r2.ebuild,v 1.1 2013/03/27 19:13:57 jlec Exp $
 
-EAPI=2
+EAPI=4
 
 inherit toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.astrolog.org/ftp/ast54unx.shr"
 
 LICENSE="astrolog"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="X"
 
 DEPEND="X? ( x11-libs/libX11 )"
@@ -21,17 +21,19 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}"
 
 src_unpack() {
-	sh "${DISTDIR}"/ast54unx.shr
+	sh "${DISTDIR}"/ast54unx.shr || die
 }
 
 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
+	sed \
+		-e 's:strip:#strip:' -e 's:^CFLAGS = :#CFLAGS = :' \
+		-e 's:\tcc :\t$(CC) $(CFLAGS) $(LDFLAGS) :' \
+		-i Makefile || die
 
 	# we use /usr/share/astrolog for config and (optional) ephemeris-data-files
-	sed -i -e "s:~/astrolog:/usr/share/astrolog:g" astrolog.h
+	sed -i -e "s:~/astrolog:/usr/share/astrolog:g" astrolog.h || die
 
 	# 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
@@ -47,14 +49,14 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	dobin astrolog || die
+	dobin astrolog
 	dodoc Helpfile.540 README.1ST README.540 Update.540
 	insinto /usr/share/astrolog
-	doins astrolog.dat || die
+	doins astrolog.dat
 }
 
 pkg_postinst() {
diff --git a/app-misc/astrolog/metadata.xml b/app-misc/astrolog/metadata.xml
index cc1c4721fdb4..58caf9491ace 100644
--- a/app-misc/astrolog/metadata.xml
+++ b/app-misc/astrolog/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>george@gentoo.org</email>
-		<name>George Shapovalov</name>
-		<description>I'll be taking care of it. But since we need to have a herd in metadata
+  <herd>sci</herd>
+  <maintainer>
+    <email>george@gentoo.org</email>
+    <name>George Shapovalov</name>
+    <description>I'll be taking care of it. But since we need to have a herd in metadata
 	I've put sci there, as it seems the most related one.
 	</description>
-	</maintainer>
+  </maintainer>
 </pkgmetadata>