* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/xephem/, sci-astronomy/xephem/files/
@ 2018-06-30 4:10 Ulrich Müller
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Müller @ 2018-06-30 4:10 UTC (permalink / raw
To: gentoo-commits
commit: 4f4c41d4036405a7d6f25ef628e1cd77ed1fc7ba
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 04:09:39 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 04:09:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f4c41d4
sci-astronomy/xephem: Don't link against libXp.
Closes: https://bugs.gentoo.org/650404
Package-Manager: Portage-2.3.41, Repoman-2.3.9
sci-astronomy/xephem/files/xephem-3.7.7-no_xprint.patch | 11 +++++++++++
sci-astronomy/xephem/xephem-3.7.7.ebuild | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/sci-astronomy/xephem/files/xephem-3.7.7-no_xprint.patch b/sci-astronomy/xephem/files/xephem-3.7.7-no_xprint.patch
new file mode 100644
index 00000000000..e41112f7b1e
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-3.7.7-no_xprint.patch
@@ -0,0 +1,11 @@
+--- a/GUI/xephem/Makefile
++++ b/GUI/xephem/Makefile
+@@ -30,7 +30,7 @@
+ endif
+
+ # for linux and Apple OS X
+-XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
++XLIBS = -lXm -lXt -lXext -lXmu -lX11
+ CFLAGS := $(LIBINC) $(CFLAGS)
+ LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm
+
diff --git a/sci-astronomy/xephem/xephem-3.7.7.ebuild b/sci-astronomy/xephem/xephem-3.7.7.ebuild
index ad77acbd721..21274e2d1ad 100644
--- a/sci-astronomy/xephem/xephem-3.7.7.ebuild
+++ b/sci-astronomy/xephem/xephem-3.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${P}-respect_env_vars.patch"
"${FILESDIR}/${P}-implicits.patch"
+ "${FILESDIR}/${P}-no_xprint.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/xephem/, sci-astronomy/xephem/files/
@ 2022-12-24 7:03 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-12-24 7:03 UTC (permalink / raw
To: gentoo-commits
commit: 09607a4dd3014f1373b1437f06d4aa0e1bce4633
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Dec 9 11:50:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 06:59:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09607a4d
sci-astronomy/xephem: enable parallel build
- add a patch to allow parallel builds
- add remote-id to make pkgcheck happy
- update obsolete virtual/jpeg dependency and order deps
Closes: https://bugs.gentoo.org/881813
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28610
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/xephem-4.1.0-allow-parallel-builds.patch | 26 ++++++++++++++++++++++
sci-astronomy/xephem/metadata.xml | 3 +++
...{xephem-4.1.0.ebuild => xephem-4.1.0-r1.ebuild} | 7 ++++--
3 files changed, 34 insertions(+), 2 deletions(-)
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
similarity index 87%
rename from sci-astronomy/xephem/xephem-4.1.0.ebuild
rename to 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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/xephem/, sci-astronomy/xephem/files/
@ 2025-05-04 6:17 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-05-04 6:17 UTC (permalink / raw
To: gentoo-commits
commit: f1412cbe8f7909a2fbae8580fe0e0b7b980c46ba
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Fri Apr 4 22:03:51 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 4 06:16:55 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1412cbe
sci-astronomy/xephem: drop 3.7.7-r1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Part-of: https://github.com/gentoo/gentoo/pull/41459
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-astronomy/xephem/Manifest | 1 -
.../xephem/files/xephem-3.7.7-no_xprint.patch | 11 --
.../files/xephem-3.7.7-respect_env_vars.patch | 137 ---------------------
sci-astronomy/xephem/xephem-3.7.7-r1.ebuild | 53 --------
4 files changed, 202 deletions(-)
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index 09e25047eca9..cf3451a46e1a 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -1,2 +1 @@
-DIST xephem-3.7.7.tgz 18128521 BLAKE2B a7d0ee2cf1be64f79ed0c5cea6d37e48c69875de5b3c9592554ee8be25b369e964c7a6bb05690ef28893b7af8277daf39ba85538f56852f35538180f9ad0c2ba SHA512 0a21f783a0a543f19a527afb87647ff2e988c6a426a37e01b9a3d1d76a9ee74125ce802e2dbc5e13034f11ef897e6188cb5b0bb92bc0d35db0fb8839e0c53157
DIST xephem-4.1.0.tar.gz 17213750 BLAKE2B 921aa4b305cb80df5746db962739d16ee23f1831b59934389ecd218b874ba1fc51aab07896d1283760db1a50be6279da50ed112320fc481f90b4f2d6e25c96dc SHA512 bcad3a6b375cabf1f44e39bc99386552d97a7e7d2ee4063dae4ccd3d5842604f0efc3407447f18a5c9e7f265bab6eebe98bdb64626dcf2135b56f346818ef1b6
diff --git a/sci-astronomy/xephem/files/xephem-3.7.7-no_xprint.patch b/sci-astronomy/xephem/files/xephem-3.7.7-no_xprint.patch
deleted file mode 100644
index e41112f7b1e0..000000000000
--- a/sci-astronomy/xephem/files/xephem-3.7.7-no_xprint.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/GUI/xephem/Makefile
-+++ b/GUI/xephem/Makefile
-@@ -30,7 +30,7 @@
- endif
-
- # for linux and Apple OS X
--XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
-+XLIBS = -lXm -lXt -lXext -lXmu -lX11
- CFLAGS := $(LIBINC) $(CFLAGS)
- LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm
-
diff --git a/sci-astronomy/xephem/files/xephem-3.7.7-respect_env_vars.patch b/sci-astronomy/xephem/files/xephem-3.7.7-respect_env_vars.patch
deleted file mode 100644
index e916bd339782..000000000000
--- a/sci-astronomy/xephem/files/xephem-3.7.7-respect_env_vars.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -ruN a/GUI/xephem/Makefile b/GUI/xephem/Makefile
---- a/GUI/xephem/Makefile 2015-08-09 22:36:50.000000000 +0100
-+++ b/GUI/xephem/Makefile 2016-01-24 09:34:24.378578717 +0000
-@@ -10,9 +10,9 @@
- # one executable, xephem.
-
- # These -I and -L flags point to the supporting XEphem libraries
--LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
--LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
--LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
-+LIBINC = -I../../libastro -I../../libip -I../../liblilxml
-+LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
-+LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
-
- # MOTIFI is the directory containing the Xm directory of include files.
- # MOTIFL is the directory containing the libXm.a library.
-@@ -30,12 +30,9 @@
- endif
-
- # for linux and Apple OS X
--CC = gcc
--CLDFLAGS = -g
--CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/opt/X11/include
--LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib
- XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
--LIBS = $(XLIBS) $(LIBLIB) -lm
-+CFLAGS := $(LIBINC) $(CFLAGS)
-+LIBS = $(LIBLNK) $(XLIBS) $(LIBLIB) -lm
-
- # static linking on Apple using X11 libs from ports
- # CC = gcc
-@@ -68,9 +65,9 @@
- # MOTIFI = -I/usr/include
- # MOTIFL = -L/usr/lib
- # CC = cc
--# CLDFLAGS =
-+# CLDFLAGS =
- # CFLAGS = $(LIBINC) $(CLDFLAGS) -O -I$(MOTIFI)
--# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL)
-+# LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL)
- # XLIBS = -lXm -lXt -lX11
- # LIBS = $(XLIBS) $(LIBLIB) -lsocket -lnsl -lc -lm /usr/ucblib/libucb.a
- # Note: if you get regex undefined, add -lgen to the end of LIBS.
-@@ -195,12 +192,9 @@
- nroff -man $? > $@
-
- libs:
-- cd ../../libastro; make
-- cd ../../libip; make
-- cd ../../libjpegd; make
-- cd ../../liblilxml; make
-- cd ../../libpng; make
-- cd ../../libz; make
-+ $(MAKE) -C ../../libastro
-+ $(MAKE) -C ../../libip
-+ $(MAKE) -C ../../liblilxml
-
- clean:
- rm -fr *.o ../../lib*/*.[ao]
-diff -ruN a/libastro/Makefile b/libastro/Makefile
---- a/libastro/Makefile 2006-02-24 03:37:31.000000000 +0000
-+++ b/libastro/Makefile 2016-01-24 09:30:28.745982455 +0000
-@@ -4,8 +4,6 @@
- # compiler and flags
-
- # gcc
--CC = gcc
--CFLAGS= -O2 -Wall
-
- # macosx universal binary
- # CFLAGS= -O2 -Wall -arch i386 -arch ppc
-@@ -83,11 +81,11 @@
- vsop87_data.o
-
- libastro.a: $(HS) $(OBJS)
-- ar rv $@ $(OBJS)
-- ranlib $@
-+ $(AR) rv $@ $(OBJS)
-+ $(RANLIB) $@
-
- libastro.so: $(HS) $(OBJS)
-- $(CC) -shared -o $@ $(OBJS)
-+ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
-
- clobber:
- rm -f *.o libastro.a
-diff -ruN a/libip/Makefile b/libip/Makefile
---- a/libip/Makefile 2009-01-05 20:53:46.000000000 +0000
-+++ b/libip/Makefile 2016-01-24 09:30:28.745982455 +0000
-@@ -2,8 +2,7 @@
- # (C) 2001 Elwood Charles Downey
-
- # gcc
--CC = gcc
--CFLAGS= -I../libastro -O2 -Wall
-+CFLAGS += -I../libastro
-
- # macosx universal binary
- # CFLAGS= -I../libastro -O2 -Wall -arch i386 -arch ppc
-@@ -36,11 +35,11 @@
- HS = ip.h fsmatch.h
-
- libip.a: $(HS) $(OBJS)
-- ar rv $@ $(OBJS)
-- ranlib $@
-+ $(AR) rv $@ $(OBJS)
-+ $(RANLIB) $@
-
- libip.so: $(OBJS)
-- gcc -shared -o $@ $(OBJS)
-+ $(CC) $(LDFLAGS) -shared -o $@ $(OBJS)
-
- clobber:
- rm -f *.o libip.a
-diff -ruN a/liblilxml/Makefile b/liblilxml/Makefile
---- a/liblilxml/Makefile 2006-02-24 03:37:32.000000000 +0000
-+++ b/liblilxml/Makefile 2016-01-24 09:30:28.745982455 +0000
-@@ -4,8 +4,6 @@
- # compiler and flags
-
- # gcc
--CC = gcc
--CFLAGS= -O2 -Wall
-
- # macosx universal binary
- # CFLAGS= -O2 -Wall -arch i386 -arch ppc
-@@ -27,8 +25,8 @@
- 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.7-r1.ebuild b/sci-astronomy/xephem/xephem-3.7.7-r1.ebuild
deleted file mode 100644
index ab4d62d3d83c..000000000000
--- a/sci-astronomy/xephem/xephem-3.7.7-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Interactive tool for astronomical ephemeris and sky simulation"
-HOMEPAGE="https://www.clearskyinstitute.com/xephem"
-SRC_URI="https://www.clearskyinstitute.com/xephem/${P}.tgz"
-
-LICENSE="XEphem"
-SLOT=0
-KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=x11-libs/motif-2.3:0
- virtual/jpeg:0
- media-libs/libpng:0="
-DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/groff"
-
-HTML_DOCS=( GUI/xephem/help/. )
-DOCS=( README )
-
-PATCHES=(
- "${FILESDIR}/${P}-respect_env_vars.patch"
- "${FILESDIR}/${P}-implicits.patch"
- "${FILESDIR}/${P}-no_xprint.patch"
-)
-
-src_compile() {
- tc-export CC AR RANLIB
- emake -C GUI/xephem
-}
-
-src_install() {
- insinto /usr/share/X11/app-defaults
- newins - XEphem <<-EOF
- XEphem.ShareDir: /usr/share/${PN}
- EOF
- newenvd - 99xephem <<-EOF
- XEHELPURL=/usr/share/doc/${PF}/html/xephem.html
- EOF
- einstalldocs
-
- cd GUI/xephem || die
- dobin xephem
- doman xephem.1
- newicon XEphem.png ${PN}.png
- insinto /usr/share/${PN}
- doins -r auxil catalogs fifos fits gallery lo
- make_desktop_entry xephem XEphem ${PN}
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-04 6:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-04 6:17 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/xephem/, sci-astronomy/xephem/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-12-24 7:03 Sam James
2018-06-30 4:10 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox