summaryrefslogtreecommitdiff
path: root/sci-astronomy
diff options
context:
space:
mode:
Diffstat (limited to 'sci-astronomy')
-rw-r--r--sci-astronomy/Manifest.gzbin7006 -> 7003 bytes
-rw-r--r--sci-astronomy/xephem/Manifest5
-rw-r--r--sci-astronomy/xephem/files/xephem-4.1.0-allow-parallel-builds.patch26
-rw-r--r--sci-astronomy/xephem/metadata.xml3
-rw-r--r--sci-astronomy/xephem/xephem-4.1.0-r1.ebuild (renamed from sci-astronomy/xephem/xephem-4.1.0.ebuild)7
5 files changed, 37 insertions, 4 deletions
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index e9dcadf51c9f..d99fc18f7bc4 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
Binary files differ
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index 31355042b882..68b97314659f 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -1,9 +1,10 @@
AUX xephem-3.7.7-implicits.patch 305 BLAKE2B ad16733b6d44619528af60a33710f3b558a16ebd24bad15b2c1ccf728a113f5495c5f26ded2c1ac61a3fedb9f916571b8bf8076527c7c2ee1353e212e710b319 SHA512 220186bb7f72fe0de6ca75a67df7b1a4d4cc57cc4768d565dc8225e20df93738c7bdd62bde6297941d1ec6638800950ef56e355de8ca1e3e8192b903b021adba
AUX xephem-3.7.7-no_xprint.patch 262 BLAKE2B 6676f7e94978d4433f3f26ff3ec4738fd3f5735462806b7f19e7aa4b7671e62e8f7e894071a04f5a90510782b8a57ab0de0a722d4c5520d5c1cf5bbc0c4c9f52 SHA512 d0277edb3c011bf606803a280461410263fe9986d164df28a6801d3bcd7a0a21405728f9d27fd3dfa1a620e4b364d1d8b65843382bd99a2cf2c3e05755a277c2
AUX xephem-3.7.7-respect_env_vars.patch 3781 BLAKE2B e596c7216c0f70145a189696ff890e136ba282113dc5c9acee4808f7a6474f7e0d9295997ee4dbc595dd8a50d1cb67d22e138b465a82a13a2e294a093f0a7061 SHA512 84a9697c3b05ed28bcc59f4b30807aad76c3228e1aec3db898995d36cae3ef58557ff984a57f60b99e15dd04670a65061451dc00437498c14ed081c0cf06830d
+AUX xephem-4.1.0-allow-parallel-builds.patch 620 BLAKE2B dbcd36eb74e0a92ae36fe02a6eabf128b783e1a1fb4da46633703cf86a46180e17d70bcd73364d0f8a4128661dad9457d1b626696373599c872323e00b6ccb02 SHA512 b2732186c2cbb0b83e56b4cd968886c734271c66a24bca0cb7fb42310c98c51d2431f4d015bd9c1c7e92086076dde34a66a94ec2bbab2d689c930e7762244dbf
AUX xephem-4.1.0-respect_env_vars.patch 3331 BLAKE2B 9e9cd514429485e7934b0d82355ebac66dce6870fd85a490f691fd4943bc23aa66531d7bce4d4e925a6d26bd7bffad0e0eb37506b593b032914a1d8d34edaeab SHA512 c88ce6569cf1e9fd27d3868344e1160d666fc0399a4dd2d4c3c10154fc947f25ebf5904123edd7ae3ca54832eeb89d67c6e2586fd4fa8e3bcb31304d44a1e8a9
DIST xephem-3.7.7.tgz 18128521 BLAKE2B a7d0ee2cf1be64f79ed0c5cea6d37e48c69875de5b3c9592554ee8be25b369e964c7a6bb05690ef28893b7af8277daf39ba85538f56852f35538180f9ad0c2ba SHA512 0a21f783a0a543f19a527afb87647ff2e988c6a426a37e01b9a3d1d76a9ee74125ce802e2dbc5e13034f11ef897e6188cb5b0bb92bc0d35db0fb8839e0c53157
DIST xephem-4.1.0.tar.gz 17213750 BLAKE2B 921aa4b305cb80df5746db962739d16ee23f1831b59934389ecd218b874ba1fc51aab07896d1283760db1a50be6279da50ed112320fc481f90b4f2d6e25c96dc SHA512 bcad3a6b375cabf1f44e39bc99386552d97a7e7d2ee4063dae4ccd3d5842604f0efc3407447f18a5c9e7f265bab6eebe98bdb64626dcf2135b56f346818ef1b6
EBUILD xephem-3.7.7-r1.ebuild 1186 BLAKE2B f249535f9449eaa36fbbe3ca33407c9d42385f0143cd77849d6f5c746934bc967bf56880f9205409bffd13e058b2fa7951d8c1181823b476a0f4c06be6d192ff SHA512 f814d7754b9f3ba339d10ca0c4b0b9ba30408b7595dfbd2e91ffe1f9924703caf7a4099bbd4ebd1f670d9310c752f78b9daa584316b93d8bd65e83f9135e7c4e
-EBUILD xephem-4.1.0.ebuild 1277 BLAKE2B 55c5dc546b977f0b0e9132cfe3c1c10da386165ee87d1ac7c3b7cc771cde76066eba18645438e5107ea1a7494f15fa962a6aeb1c7a65acd4c4a37f31898e37f4 SHA512 b1ad50f4642442a75c624a0da3ee388ba66b1e24235520b6643dce1d42051cec998f8b17ae9e1b97b114de60941c32b79552976dd6a29352af92d1fb6f77f140
-MISC metadata.xml 731 BLAKE2B 980eecb953df6c70d788fd68a61cc584f6b1d6605c6970afc82a21ab0a6dacd69354e8156bc0b7dfc04cc205042d2d1d2170abd40bbb74a077a0462a72a78d95 SHA512 ac2f5d29c822dc4e89eedcfa0e2797d61a29531509267290e4426df1ca6179e9b07673f961b473cafacb2b35cf7e0b6f579053648bcee6ae61ae9dee319eaa55
+EBUILD xephem-4.1.0-r1.ebuild 1442 BLAKE2B bdb69563d4d5687669d3e253047be7be17df3d2c8dc8e096e18ac8874cfb2d0a05d3649ca4b782e973df5fd0bdc7f90ff94204dc0d664d6581c81a3b4317a58f SHA512 97b7408564f6d209007aa3b47a4d15fe36ffdb4ce0be0759b23bdb70f4bd785764c8960769de8efd1920d6e70ef3b1b656fb3544bd8affa317724b5e38ec502e
+MISC metadata.xml 809 BLAKE2B a7bb501c3896ab9cda8bfd76212ca6eba0efa46fb12d3d272b566bdd25402c9aa235feec36d78d49480f8e8ab6ca13ba7c02506aeb4ccf70a9ece678c4e4ead3 SHA512 bd4f46f28856dd588170fb9ee5cfb0c8be96deba1ca86c22bc6ed9b6bbf4667cf172ad8559186edc43a328af6a0c73571dedf051420eb571804e27c59ffbe280
diff --git a/sci-astronomy/xephem/files/xephem-4.1.0-allow-parallel-builds.patch b/sci-astronomy/xephem/files/xephem-4.1.0-allow-parallel-builds.patch
new file mode 100644
index 000000000000..87d4a32e8857
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-4.1.0-allow-parallel-builds.patch
@@ -0,0 +1,26 @@
+From 89cc80f47cdf71d3a5eae0ea6a2bade329a3e1fb Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 9 Dec 2022 12:30:24 +0100
+Subject: [PATCH] allow parallel builds
+
+Ensure all libraries are ready before the final binary is
+going to get linked.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/GUI/xephem/Makefile
++++ b/GUI/xephem/Makefile
+@@ -182,9 +182,9 @@ OBJS = \
+ xephem.o \
+ xmisc.o
+
+-all: libs xephem xephem.1
++all: xephem xephem.1
+
+-xephem: $(INCS) $(OBJS)
++xephem: libs $(INCS) $(OBJS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+ xephem.1: xephem.man
+--
+2.38.1
+
diff --git a/sci-astronomy/xephem/metadata.xml b/sci-astronomy/xephem/metadata.xml
index b68063e309e9..a6c852e0ab3d 100644
--- a/sci-astronomy/xephem/metadata.xml
+++ b/sci-astronomy/xephem/metadata.xml
@@ -13,4 +13,7 @@
the moons of Jupiter, Saturn and Earth; Mars' and Jupiter's central
meridian longitude; Saturn's rings; and Jupiter's Great Red Spot.
</longdescription>
+ <upstream>
+ <remote-id type="github">XEphem/XEphem</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sci-astronomy/xephem/xephem-4.1.0.ebuild b/sci-astronomy/xephem/xephem-4.1.0-r1.ebuild
index 8b8f87e5ba22..ef46be975575 100644
--- a/sci-astronomy/xephem/xephem-4.1.0.ebuild
+++ b/sci-astronomy/xephem/xephem-4.1.0-r1.ebuild
@@ -16,9 +16,9 @@ KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-libs/openssl:=
- >=x11-libs/motif-2.3:0
- virtual/jpeg:0
+ media-libs/libjpeg-turbo:=
media-libs/libpng:0=
+ >=x11-libs/motif-2.3:0
x11-libs/libXext
x11-libs/libXmu
x11-libs/libXt
@@ -28,9 +28,12 @@ BDEPEND="sys-apps/groff"
HTML_DOCS=( GUI/xephem/help/. )
+# NOTE: order is relevant - parallel build patch requires respect env vars
+# patch to be already applied
PATCHES=(
"${FILESDIR}/${PN}-3.7.7-implicits.patch"
"${FILESDIR}/${P}-respect_env_vars.patch"
+ "${FILESDIR}/${P}-allow-parallel-builds.patch"
)
src_compile() {