gentoo resync : 24.02.2018

3 files changed, 3 insertions, 72 deletions

diff --git a/app-misc/astrolog/Manifest b/app-misc/astrolog/Manifest
index a4035bdb4624..a2311febf838 100644
--- a/app-misc/astrolog/Manifest
+++ b/app-misc/astrolog/Manifest
@@ -1,5 +1,4 @@
 DIST ast54unx.shr 1465432 BLAKE2B 9eec58fb66110a7fd072eee8b02dda109a22c1a1d59506943011041ab595e33eac39f5372ab55f587bcdfb447e599b16b8a9f0ccd04c54257b0dd38a85acde08 SHA512 824fcea1891dafc77692e84a36cc97a8afd90ad93d772edab8437e89869cdc912002f628fd86eecc8182ba4f1ad02cb98f42a30fde425bf94cf59f852b4eda1a
-EBUILD astrolog-5.40-r1.ebuild 2095 BLAKE2B 6e5ba9161deffc6191ab8a9b2ce377936d503e54c4ee8cda644e55a777d736d8d55ff6e03598ff27223fc8cc3162bc0a326663e5e2be90f65a3dc16302cc62a0 SHA512 3d7766d07a6c0df8c3e71e65524805eff84a4ae177612274e8731ec5b5fdb9f3df1717c93346dbf64971422bdb02127fbe1faf9b451abc8de1260d7b8814f8a8
 EBUILD astrolog-5.40-r2.ebuild 2093 BLAKE2B 4abb37900a6fc86a1326f27428698b244df65a6271b25b94fc251a2186f067411e873ea2458f580da5f203e45d7339069b441b1fcf3b118d263cac8550270982 SHA512 d92361442fd0733d94add2d2a132589fe02d71b60e1263da0ee539fede76558545d3ffed8dfe5120307032031e1e9a46e4658cab9c2d2b46ebe633d1bbac84ed
-EBUILD astrolog-5.40-r3.ebuild 2128 BLAKE2B f4b895a5818e93c2ed4d3840c1124c605024bb99a60636cfbe9edf415b748db69ac20911fb26902f8fc41d7cfadac3e9454ff09e6e594b70c4fcbf5e4d4f99e4 SHA512 278e7ac93f8fd3e71c8291bf63cf19ff0dac00f78288b9dbcaf6f80107e2cc88d1f00c01521f08be3af8cb26f2d2d2147b578a6ceee0b2f11a13cb42aa6ffed8
+EBUILD astrolog-5.40-r3.ebuild 2127 BLAKE2B 623fa300de585296a034f9e90cb92933c92b6202257a9e9839f0d9004b1e600465b5f71dd9721aba972662942f58ce8b585d981270eac7afd761ddeb9aa2d4c4 SHA512 b8003620c9fc68e2ccc794934123aabde690a14481a8fd303a6c0242085d9549f5f08dd6d6f13bb443a237927d1a94c49100c719da70c6a14282e430b01fcc5a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/astrolog/astrolog-5.40-r1.ebuild b/app-misc/astrolog/astrolog-5.40-r1.ebuild
deleted file mode 100644
index 6fe1978c6375..000000000000
--- a/app-misc/astrolog/astrolog-5.40-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="A many featured astrology chart calculation program"
-HOMEPAGE="http://www.astrolog.org/astrolog.htm"
-SRC_URI="http://www.astrolog.org/ftp/ast54unx.shr"
-
-LICENSE="astrolog"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="X"
-
-DEPEND="X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	sh "${DISTDIR}"/ast54unx.shr || die
-}
-
-src_prepare() {
-	# 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 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
-
-	# 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
-		   sed -i -e "s:#define X11:/*#define X11:g" astrolog.h
-		   sed -i -e "s:#define MOUSE:/*#define MOUSE:g" astrolog.h )
-
-	# any user may have an own astrolog configfile
-	#sed -i -e "s:astrolog.dat:astrolog.dat:g" astrolog.h
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin astrolog
-	dodoc Helpfile.540 README.1ST README.540 Update.540
-	insinto /usr/share/astrolog
-	doins astrolog.dat
-}
-
-pkg_postinst() {
-	ewarn "There is a sample config file /usr/share/astrolog/astrolog.dat"
-	ewarn "astrolog looks in current dir for a file astrolog.dat before"
-	ewarn "using the file in /usr/share/astrolog"
-	ewarn "If you want extended accuracy of astrolog's calculations you"
-	ewarn "can emerge the optional package \"astrolog-ephemeris\" which"
-	ewarn "needs ~4.7 MB additional diskspace for the ephemeris-files"
-}
diff --git a/app-misc/astrolog/astrolog-5.40-r3.ebuild b/app-misc/astrolog/astrolog-5.40-r3.ebuild
index d75e36445013..0f14039203e9 100644
--- a/app-misc/astrolog/astrolog-5.40-r3.ebuild
+++ b/app-misc/astrolog/astrolog-5.40-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,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 )"