Respect AR, RANLIB wrt #436646 by Agostino Sarubbo <ago@gentoo.org>

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

4 files changed, 89 insertions, 6 deletions

diff --git a/sci-astronomy/xephem/ChangeLog b/sci-astronomy/xephem/ChangeLog
index 1863f098af68..01687d805a24 100644
--- a/sci-astronomy/xephem/ChangeLog
+++ b/sci-astronomy/xephem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/xephem
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.41 2012/09/30 11:58:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.42 2012/09/30 19:50:53 xarthisius Exp $
+
+  30 Sep 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/xephem-3.7.5-respect-flags.patch, xephem-3.7.5.ebuild:
+  Respect AR, RANLIB wrt #436646 by Agostino Sarubbo <ago@gentoo.org>
 
   30 Sep 2012; Agostino Sarubbo <ago@gentoo.org> xephem-3.7.5.ebuild:
   Stable for amd64, wrt bug #423673
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index 4602c4295591..f123e5e5956b 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -1,10 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 3.7.2.patch 1290 SHA256 c314c3f969eb13cf2151c4698e0721cebe714e62263d15dc3a7406daecf94a35 SHA512 f383437d4a153d239d194c0b661d820c7a133f4a7551fe84f8bb8a38b5d07845b2cdf664c0ec4bef10e15a0cff5ae3e5aaf9e6fcfd681e088c3b326ce8d78311 WHIRLPOOL c24190532ba7ec8d6f9b4a9ea00152361b3c20207a0a52f204e6215ef131237890d9ee36cd54116af874eacae7fa79396ceb15f1fca716a038b394ffa9046285
 AUX xephem-3.7.3-use-system-lib.patch 1422 SHA256 6520076d6f201e05d3c5285a6bf58b859363bd0fdfc653b09c93769c57a44746 SHA512 db3433a8d4384a08b0b49e20f6973dbf577cf6351f6643c46d482b136554e26ed2317dec9be74577db6e74144cc4ea0ba26ba817edaad62e69a66999ecb9f855 WHIRLPOOL 558b53e7503f5f81926466e26f00cc1ea0c32a5cb7ce7d160abc6b9dfca217c06e64bdf9111ec121c3dcadc4381f24f1f1d95af2ed3627facdb1564e58b40fdc
 AUX xephem-3.7.4-libs-flags.patch 5206 SHA256 ae5eebb288daa710cceb19e2e5d52307137b1f190095387915ed8bc33c5f575d SHA512 36025f3b42c89137a09af1e9d3f6fccff5e4a6d8466c4818de074cf018813a02cb8ff5a27d0907e7c5dba3ab889ca1af89402fa3f02614b5519f28a9af28161b WHIRLPOOL f7a3bd53c5dea73e3ad1b0bdd869d2fd1c24f1bc5c2e8ea3c0e0d4638b819ad3c8d6341680e74444c03928c6d0c182cd34466b0555b8b3dfbb76e408b0f0957e
 AUX xephem-3.7.4-overflows.patch 426 SHA256 89591dd616340a114e951a7d7c6661bc4379a8da7ec821bd5a29e60d4186fd8f SHA512 be610e5221c41380b4d98fbb9cb20a0ff72a67b86772e340e914aa46d3c26f3c9c12dbe0213d33aa497dde168a6110d2068e014d506a2888797c2cff0ea5e634 WHIRLPOOL 0baf1b6a997c6270e6766f688b875470f32ee21d59e7958fdcc4e73b6e3086c20a2ba8518857693f15624bcc28bb6c098e2f4dd7884bc6db8d0e21da2adda339
+AUX xephem-3.7.5-respect-flags.patch 1133 SHA256 11e351d150a670ab417e2f2b9eccc6cf6839f258c577c32c39bf3dffd461c357 SHA512 0d47ff6b60488aa9b209e34a9e561adf033465137bd3a176418e9b2cf4bb6b948d83647a1a4c7f4a09da8b02a53d64f42c4f5794d7700f2404bb9791dcdf89bf WHIRLPOOL e7249f80818d95304aa88d3c99dd65617804930c36e4f497ba9223e84553127377b2b921a6bb6740172de0804f687fc888d789f5f73eb4d7da4fcb6d25ab0d4b
 DIST xephem-3.7.3.tar.gz 22148450 SHA256 450fa05a36ce4c8ceca80bd5a003c060bc4d9e07719aebcb13565b563b90e337 SHA512 0f7241f560cd7f41874570911f0387570606be128230a56071621cdd2fbca873694e3d65194a4b937716517a5575aff9ef8ebace9f6f9faf2f21332a43f961bc WHIRLPOOL 6cf5804da2b0de0c5b5e445d26463b7c16aafb96a8e52140e44b733201dc7a3a34b7d569a397f361919e6eb0ee885428388d32cc550e62fe511dca411c58cb72
 DIST xephem-3.7.5.tar.gz 18908521 SHA256 edda7975bb690f74b1853d2729de2b0f4ada69fb37a08117ace7a22c23ee7d1a SHA512 58cd75e4cf8b541d818631e50453f14275cf81ca3349c442ac62eb7fa15509d3d2d57f88420f866312e41ecfd333c8aeeade7656a84e6e527811f98a26b8588d WHIRLPOOL 6d97bf755cc5e98909aa66c1a0ae942f32dd74541ef6e7c03d7c76214462a10929935a38a5a7c468e28ba315f019d9a0489e345f95ee547238d2250fdc9f8005
 EBUILD xephem-3.7.3.ebuild 2413 SHA256 8a81e35a1f5d70aeb3b89633de739089fc8f210045281f183f3e86f6497e34e7 SHA512 9b037df3109ed6b64e911ebe5f067a5f13ca08c4867237b65b480427e389a8f82ffe283b1835e1664898f147c81c2ca9775873b9c94f012296f1c583d25a1c62 WHIRLPOOL 50a149192e630bde71f9a48e3d954df712245d0b4b4cc09de6817e6773787f534107851d0ff9937a3ccc20c1bb20fa62e00862f19860d7b0ba934267c7796b83
-EBUILD xephem-3.7.5.ebuild 1851 SHA256 15f49d08dc0a8003a9d812c39037c0a9e04f00bcf812bfd9a0970d0402ca5ccb SHA512 9356759349a34393316f75455b3b334772128118fe17193d34eda6fc38876c1bb3f2d02d7734b240495ffe24401d1d6d1057b224da47b5a62d1c91fbe6322e02 WHIRLPOOL 27f46d3155bf72201054a382ed352259625ab3ce81538610ddcc2d91b8b24ab20ac30b3baba2a356cdf7b1fc75bfaa60e02407fe1ff8e5140324f6d8696df6ce
-MISC ChangeLog 8652 SHA256 90909f75e276fa630b9512c2c52c87bf0e10c0cdd4ab83b3918c3065c0d3921c SHA512 66b9db260d3c9736b59b57d37aa5e61dbf747f2ff0ea9c15f0369d322c4cd89ce9c50f445ff9198ef7739e6a9b8b03f82e01c589759de5ddf5ddf0567a32094f WHIRLPOOL f5850d9076242c18146207330ffc3b420261d3b6503bd72da12cfa66b90d864592c9b56df2baf382cf9416b170b5e022971738f155b75fafd6201b6a44dda9bc
+EBUILD xephem-3.7.5.ebuild 1911 SHA256 f87209124a649c9aa0f6af16c153ffb417149dedb3b0cbd3bf301fbb3cb2686d SHA512 c6a4ef0edf0d394f99d63dcf9edb307c37617b934cd11f26c61c735bcc2c93c8eb53e5823ae2d6ce7cf33f4b3d8f8539505e5743d8829311f4eaf181d18ab58a WHIRLPOOL 0bcaacce08972730abe071ea9070d77e17bf51e95793e805ce8f8aca64dc89c75a4d3a6c1ad8bd3d7b49a88ed5fc6a2886a5ab75eb4ad42d78a448589f2e1bc6
+MISC ChangeLog 8848 SHA256 5856141bbe225974fbf0ee31ad4374464feec8cebf611f0c8595bebdef9aa44e SHA512 7d3967854fea6ed095c97899314a867c78c0c328521ca2a244068bfadd0ac3f6b7ecc961301cc912acdfc4c5adbf31c57eb71aa53926a6c8bd9d44b6bda3c45f WHIRLPOOL b04ee46e10929f1d18e208a093dc69f617f6a35910231d7e22f4457b4b58ef695b4491cc2579564300b002b996e713b99ccff75ce9f844ad501f86cc14a15fbc
 MISC metadata.xml 629 SHA256 8513581aa7fd9a7322ccb643ec327986f298cc5dda38efa615cf3fc24feeedaf SHA512 c2f602cce8a7391004eab42ac6beffaf4cf26db131661372300f75052ebff3318e128baed2d9de8ac6f4b3d2a669322d03558992772d170b6f7deb1e44edc620 WHIRLPOOL 12d998845b4e4424f61cfe305488d803f307af03971b92ca43c8140b8843ce02f075859de91730a9f7c901c52abeec5c2dfe6895d1d7cda4d71d818ead99ad80
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQaKKmAAoJEF0huFKJUZL5pccP/3cwAuTQiMbv1UVaIS3k5qNr
+nPkWzeFQut/BKVs2b0ybhJLwImCdzBg3E7iyZh4V7MfYw6xlaAGRHnXe2jSjFM6E
+l2p35rWnubwy+AahcxcoIgcBGDbBNLoWPg98qn3ZNSBp31Vjgtfymm7wIWw0UVP8
+i/DGgjXlSaylUUtMpD8elNQDqDOvaVGhAxITF9X5YrTjauW+VqxcAN/mCvzfcMml
+wSi9e7IjjQGtGInqUoRfChWV+Af6t0yqpbLckH8tLWnN5IfPhGerjnH5dkmlBz4n
+HUc0ZC2Dd6WmYm3Bq/WGKLi7C9rN7tN7sLleuqYlU/uuj2QOLikjSrtEfl8iSntB
+HQKBIpqcUc9suNhvjV8UjDoI8Yjvr6ina91WeEEPUCJw9pEDNE9M14+x+VVDKqIB
+iTgpSCgOlgw/Cz1rhM5lL0Cn2npaA4Z8C+yogwrDlmb1BCTKa2wQb/+dQ7QSEPuY
+u2YS4+ON3S++zI7ssMCvpUtFlrbGW0/wulZicL5rtYKuaJJYygKF3NnaiZLnZb0p
+pVymOvChlpIdjZa7PqEDFxSVcGVsRhUgxDFUXr+1fvSbloF11lrEiCwhDmc4N7bE
+yZFhHsrrr+r63xc4sXH3FetLggjUlV2qAc7xzXpwA5KwdI0leK6DLqXqmAMxeacV
+lwc5cNo+TVY/pZD4LCtN
+=YWYb
+-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/xephem/files/xephem-3.7.5-respect-flags.patch b/sci-astronomy/xephem/files/xephem-3.7.5-respect-flags.patch
new file mode 100644
index 000000000000..8a695652fac4
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.5-respect-flags.patch
@@ -0,0 +1,57 @@
+Respect AR, RANLIB
+
+https://bugs.gentoo.org/show_bug.cgi?id=436646
+
+Patch written by Kacper Kowalik <xarthisius@gentoo.org>
+--- a/libastro/Makefile
++++ b/libastro/Makefile
+@@ -79,8 +79,8 @@ OBJS =			\
+ 	vsop87_data.o
+ 
+ libastro.a: $(HS) $(OBJS)
+-	ar rv $@ $(OBJS)
+-	ranlib $@
++	$(AR) rv $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ libastro.so: $(HS) $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+--- a/libip/Makefile
++++ b/libip/Makefile
+@@ -35,8 +35,8 @@ OBJS =	\
+ HS = ip.h fsmatch.h
+ 
+ libip.a: $(HS)	$(OBJS)
+-	ar rv $@ $(OBJS)
+-	ranlib $@
++	$(AR) rv $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ libip.so:    $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
+--- a/libjpegd/Makefile
++++ b/libjpegd/Makefile
+@@ -62,8 +62,8 @@ OBJS = \
+ 	jutils.o
+ 
+ libjpegd.a: $(HS) $(OBJS)
+-	ar r $@ $(OBJS)
+-	ranlib $@
++	$(AR) r $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ clobber:
+ 	touch x.o x.a
+--- a/liblilxml/Makefile
++++ b/liblilxml/Makefile
+@@ -24,8 +24,8 @@ HS = lilxml.h
+ OBJS = lilxml.o base64.o
+ 
+ liblilxml.a: $(HS) $(OBJS)
+-	ar r $@ $(OBJS)
+-	ranlib $@
++	$(AR) r $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ liltest: liltest.o liblilxml.a
+ 	$(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a
diff --git a/sci-astronomy/xephem/xephem-3.7.5.ebuild b/sci-astronomy/xephem/xephem-3.7.5.ebuild
index 222b1376f492..87a14b159f76 100644
--- a/sci-astronomy/xephem/xephem-3.7.5.ebuild
+++ b/sci-astronomy/xephem/xephem-3.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.5.ebuild,v 1.5 2012/09/30 11:58:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.5.ebuild,v 1.6 2012/09/30 19:50:53 xarthisius Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -22,11 +22,12 @@ src_prepare() {
 	# make sure we use system libs and respect user flags
 	epatch \
 		"${FILESDIR}"/${PN}-3.7.4-libs-flags.patch \
-		"${FILESDIR}"/${PN}-3.7.4-overflows.patch
+		"${FILESDIR}"/${PN}-3.7.4-overflows.patch \
+		"${FILESDIR}"/${P}-respect-flags.patch
 }
 
 src_compile() {
-	tc-export CC
+	tc-export CC AR RANLIB
 	cd GUI/xephem || die
 	emake
 	local i