4 files changed, 82 insertions, 66 deletions
diff --git a/app-misc/astrolog/Manifest b/app-misc/astrolog/Manifest
index 7f64c97d48de..870025f9774a 100644
--- a/app-misc/astrolog/Manifest
+++ b/app-misc/astrolog/Manifest
@@ -1,5 +1,6 @@
 AUX astrolog-7.60-drop-resiters.patch 1354 BLAKE2B f986926b3ec4653bb17cb0363ebdf06896d68c140201a4ae714ba2aaf231717349c6e0426906e06561b1ef6f1e241d3b92d7020c357ecd438ebeeada617b9cfa SHA512 68bf5c0ade2c3cee96f198e3092930bff003e6913bfd5ae0fc16e7b381509f0bbb213c2d08009d4c9485e64be44293024a853b5efb19b837f700ffb292cb3593
 DIST ast74src.zip 4483648 BLAKE2B d15d3e5d98337c5c5884973d079cffda9144a5c9f43ab48dd38f782eeef089d9fd5fb3f5a01f1d607bd2134e6a774494d4cf7d99e117d3092c8787626436e778 SHA512 540bda7ee10cde0723f6bd4afe410e4e9c59168e31dbdbd0b3b62a9e77ae83a971543fc812876258e2b7b9636f880c74b9be5497c54e7dd0e9b444bad2edbf6b
-EBUILD astrolog-7.40.ebuild 1864 BLAKE2B 2e7e7b1902509516c193437dec820316e516c328ec44f5275d609990a512722909b0841b7780e86d162e0475275906579c978eea30503e42bd53c56d93e10a59 SHA512 495f9325356add4eefd40bb00c3c3271cf339b8304901f19fec0978893ef1891cc86372ad456e8653ce7b5447a0489126b9cb6fe059aecc648f3a1f527274c3d
+DIST ast77src.zip 4706533 BLAKE2B ea5ae3805ea43d61f5ff27f199bd36e7263800e441b1aa31044c814b08f6ae2be8969d752a16262ec944dbaae0e0bc2ab3413ee14edbe2366f332a56452bc4d1 SHA512 f5ad29cc023e4bd6a36ddc8434f422fcfe4dbd0b3ebebb85bf6e2d12de58cf60e8304c8a5cea6cb385de346dc1441752542774ee1e7319de9af2166289fd1291
 EBUILD astrolog-7.60.ebuild 1923 BLAKE2B 80b835e77ed26a97221fe802b085e0ff859001b6fb35a614da53d586641569ac0da68973dfd74aa98faa68d47e74bb4596dd598b3d0f9ea55041e2a6cbd70716 SHA512 6ddda60d1b2f52913f7da18d40352940b7bad8111df79042d75bea9a49e99dd95d46f46a1459f643db117cdbce03c0838f521141f33a26f3ae8abdb7fd5c3897
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD astrolog-7.70.ebuild 2000 BLAKE2B 54e36cde34e58e95a174503102a3489c27d4c1f28bb75bbce42c4628b746fe6cff34bcb9934fb4d40685b0c32ca3d8682bf46f7b78cbb37044ec23598c01076f SHA512 fa9be4fdc019021ce4fae0ee0e5aeb115f7542f86d45e36cd95737787780ef049c642100ac6767e060608f723f8b90196e2f219fcc42204e440082f91eb463f6
+MISC metadata.xml 252 BLAKE2B 4e6ba57de638a5c8ac6559124dc2d0123e7cc1e081aa924fb0e656d6905020a90dd30494fad0adc99622f6ae4e1a7a60fa02d7aacddc6d061ff774a2b703eac6 SHA512 18a4d8f7719d25b9fe2b1351a16529ab659808f1e64a64a84dcf1ab597b7a6c12e3a96050ec3177e50be762f2812cc1eb5f47c49f951a451899f29856abd11dd
diff --git a/app-misc/astrolog/astrolog-7.40.ebuild b/app-misc/astrolog/astrolog-7.40.ebuild
deleted file mode 100644
index ab421e0eb9aa..000000000000
--- a/app-misc/astrolog/astrolog-7.40.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-misc/astrolog-ephemeris
-
-inherit toolchain-funcs
-
-DESCRIPTION="A many featured astrology chart calculation program"
-HOMEPAGE="https://www.astrolog.org/astrolog.htm"
-SRC_URI="https://www.astrolog.org/ftp/ast74src.zip"
-
-LICENSE="astrolog"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="X"
-
-DEPEND="X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# remove stripping of created binary, dump hardcoded CFLAGS,
-	# respect CC (bug #243606), and CFLAGS (bug #240057)
-	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 || die
-
-	# 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
-	use X || ( sed -i -e "s:-lm -lX11:-lm:g" Makefile || die
-		   sed -i -e "s:#define X11:/*#define X11:g" astrolog.h || die
-		   sed -i -e "s:#define MOUSE:/*#define MOUSE:g" astrolog.h || die)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin astrolog
-	dodoc astrolog.doc changes.doc
-	insinto /usr/share/astrolog
-	doins astrolog.as
-}
-
-pkg_postinst() {
-	elog "There is a sample config file /usr/share/astrolog/astrolog.as"
-	elog "astrolog looks in current dir for a file astrolog.as before"
-	elog "using the file in /usr/share/astrolog"
-	elog "If you want extended accuracy of astrolog's calculations you"
-	elog "can emerge the optional package \"astrolog-ephemeris\" which"
-	elog "needs ~32.9 MB additional diskspace for the ephemeris-files"
-}
diff --git a/app-misc/astrolog/astrolog-7.70.ebuild b/app-misc/astrolog/astrolog-7.70.ebuild
new file mode 100644
index 000000000000..84ef17f76a89
--- /dev/null
+++ b/app-misc/astrolog/astrolog-7.70.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please also check if app-misc/astrolog-ephemeris archive needs update
+
+inherit toolchain-funcs
+
+MY_PV=$(ver_rs 1 '')
+
+DESCRIPTION="A many featured astrology chart calculation program"
+HOMEPAGE="
+	https://www.astrolog.org/astrolog.htm
+	https://github.com/CruiserOne/Astrolog
+"
+SRC_URI="https://www.astrolog.org/ftp/ast${MY_PV:0:2}src.zip"
+
+S="${WORKDIR}"
+
+LICENSE="AGPL-3 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+
+	# we use /usr/share/astrolog for config and (optional) ephemeris-data-files
+	local cfgargs=( -e "s:~/astrolog:/usr/share/astrolog:g" )
+	# if we do NOT use X, we comment the "#define X11" in astrolog.h
+	use X || cfgargs+=( -e "s:#define X11://&:g" )
+
+	sed -i "${cfgargs[@]}" astrolog.h || die
+
+	local makeargs=(
+		# respect CXX (bug #243606), and LDFLAGS
+		-e 's:\tcc :\t$(CXX) $(LDFLAGS) :'
+		# respect -O flags
+		-e '/^CPPFLAGS/s:-O ::'
+	)
+	sed -i "${makeargs[@]}" Makefile || die
+}
+
+src_compile() {
+	local libs=( -lm -ldl )
+	# we need to link with -lX11 if the X use is set
+	use X && libs+=( -lX11 )
+
+	# Makefile contains stripping flag in LIBS. It is easier to overload it
+	# here because we need to control LIBS content with X use anyway.
+	emake LIBS="${libs[*]}"
+}
+
+src_install() {
+	dobin astrolog
+	dodoc astrolog.doc changes.doc
+	insinto /usr/share/astrolog
+	doins astrolog.as
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "There is a sample config file /usr/share/astrolog/astrolog.as"
+		elog "astrolog looks in current dir for a file astrolog.as before"
+		elog "using the file in /usr/share/astrolog"
+		elog "If you want extended accuracy of astrolog's calculations you"
+		elog "can emerge the optional package \"astrolog-ephemeris\" which"
+		elog "needs ~32.9 MB additional diskspace for the ephemeris-files"
+	fi
+}
diff --git a/app-misc/astrolog/metadata.xml b/app-misc/astrolog/metadata.xml
index 85e4ed814fa2..41cdaf139913 100644
--- a/app-misc/astrolog/metadata.xml
+++ b/app-misc/astrolog/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">CruiserOne/Astrolog</remote-id>
+	</upstream>
 </pkgmetadata>