[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/calc/, sci-mathematics/calc/files/

[Andreas Sturmlechner]

commit:     2e64c9571332b9cea039766db02066a753d1b48e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 21:34:28 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 21:59:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e64c957

sci-mathematics/calc: drop 2.12.5.4, EAPI-6--

Closes: https://bugs.gentoo.org/867544
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-mathematics/calc/Manifest                      |   1 -
 sci-mathematics/calc/calc-2.12.5.4.ebuild          |  58 --------
 .../calc/files/calc-2.12.5.4-as-needed.patch       | 161 ---------------------
 3 files changed, 220 deletions(-)

diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest
index dce8694b801d..c169f4401520 100644
--- a/sci-mathematics/calc/Manifest
+++ b/sci-mathematics/calc/Manifest
@@ -1,2 +1 @@
-DIST calc-2.12.5.4.tar.bz2 956258 BLAKE2B 47c2ab46c47baf0d1f1d202a36e0d42cf0b25f7eecf61815814081b2f76aa65dc8cc4e970078a5176266ce1332751169424d1c6d2c16ff148a1b014986b56d47 SHA512 07c89059d4718b29e649a5198e0bb6c6a6d9c6705a0050ad744146f1649c65d0fb1277a68eb45daca907b08ef9336de2002808a5f9b2312e413eb3afb74d491f
 DIST calc-2.13.0.1.tar.bz2 987542 BLAKE2B bbd93aa296211dde8f7d00a86e222bf4ccc0065da021c1666c333610c6837a1984995c74995571af025e68ec64519ed2d158731448037ee0a4f2eafccfc1a625 SHA512 7d7e07072779c97aaeb966f9282a6e4127c839ecadd0b7269d37d587949c47075d301c3420735f903ba179ae2bbbd309fd29e459fbf12b450e528aadc66537c4

diff --git a/sci-mathematics/calc/calc-2.12.5.4.ebuild b/sci-mathematics/calc/calc-2.12.5.4.ebuild
deleted file mode 100644
index d1dc4ec7f9e1..000000000000
--- a/sci-mathematics/calc/calc-2.12.5.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Arbitrary precision C-like arithmetic system"
-HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
-SRC_URI="http://www.isthe.com/chongo/src/calc/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-as-needed.patch"
-)
-
-src_prepare() {
-	default
-	ln -sf libcustcalc.so.${PV} custom/libcustcalc.so || die
-	sed -i -e "/DIR/s:/usr:${EPREFIX}/usr:g" Makefile || die
-}
-
-src_compile() {
-	# parallel compilation hard to fix. better to leave upstream.
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		DEBUG="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CALCPAGER="${PAGER}" \
-		USE_READLINE="-DUSE_READLINE" \
-		READLINE_LIB="-lreadline -lhistory $($(tc-getPKG_CONFIG) --libs ncurses) -L\"${S}\"/custom -lcustcalc" \
-		all
-}
-
-src_test() {
-	if echo "${LD_PRELOAD}" | grep -q "sandbox"; then
-		ewarn "Can't run check when running in sandbox - see bug #59676"
-	else
-		emake chk
-	fi
-}
-
-src_install() {
-	emake \
-		T="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-	dodoc BUGS CHANGES LIBRARY README
-}

diff --git a/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch b/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch
deleted file mode 100644
index 3dbb2cd1bf47..000000000000
--- a/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch
+++ /dev/null
@@ -1,161 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1136,14 +1136,14 @@
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- else
--LIBCUSTCALC_SHLIB=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- endif
- #
- CC_STATIC=
-@@ -1173,7 +1173,6 @@
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
- LD_SHARE= ${DARWIN_ARCH}
- #SET_INSTALL_NAME= no
- SET_INSTALL_NAME= yes
-@@ -1249,14 +1248,14 @@
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- else
--LIBCUSTCALC_SHLIB=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- endif
- #
- CC_STATIC=
-@@ -1294,12 +1293,10 @@
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -1333,12 +1330,10 @@
- BLD_TYPE= calc-dynamic-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -1370,12 +1365,10 @@
- BLD_TYPE= calc-static-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -1411,11 +1404,9 @@
- BLD_TYPE= calc-static-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- #
- CC_STATIC=
- LD_STATIC=
-@@ -1470,12 +1461,11 @@
- BLD_TYPE= calc-static-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
- LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
- else
- LIBCUSTCALC_SHLIB=
- endif
-@@ -1510,14 +1500,14 @@
- BLD_TYPE= calc-static-only
- #
- CC_SHARE= -fPIC
--DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
--LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
--    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
--LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
-+LD_SHARE=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- ifdef ALLOW_CUSTOM
--LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- else
--LIBCUSTCALC_SHLIB=
-+LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
-+LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
- endif
- #
- CC_STATIC=
-@@ -2110,7 +2100,7 @@
- 
- calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
- 	${RM} -f $@
--	${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
-+	${CC} ${LDFLAGS} ${CALCOBJS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
- 	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
- 
- libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE}