commit: 5e11652b042407cf4cbf10617cab42cf4f7f67f1 Author: Cheyenne Wills <cwills <AT> witznd <DOT> net> AuthorDate: Mon Oct 4 23:04:16 2021 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Oct 8 11:53:43 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e11652b
dev-lang/icon: Remove old Signed-off-by: Cheyenne Wills <cwills <AT> witznd.net> Closes: https://github.com/gentoo/gentoo/pull/22491 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-lang/icon/Manifest | 2 - dev-lang/icon/files/icon-9.5.1-flags.patch | 75 ----------------- dev-lang/icon/files/icon-9.5.1-fpoll.patch | 27 ------- dev-lang/icon/files/icon-9.5.1-musl.patch | 24 ------ dev-lang/icon/icon-9.5.1-r1.ebuild | 108 ------------------------- dev-lang/icon/icon-9.5.1-r2.ebuild | 126 ----------------------------- dev-lang/icon/icon-9.5.20h.ebuild | 123 ---------------------------- dev-lang/icon/metadata.xml | 3 - 8 files changed, 488 deletions(-) diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest index 85152f23b6f..965e85ae01b 100644 --- a/dev-lang/icon/Manifest +++ b/dev-lang/icon/Manifest @@ -1,3 +1 @@ -DIST icon-9.5.20h.tar.gz 3137602 BLAKE2B 093290f7df4d0c1686b57c1debabdae5ab607fab00849885fd97b68b872db9d360e9ffe61b7be2e503f5ffa70a387011128c65586b0d48e298577d0ca690a729 SHA512 c3dec5d9d6f2e01fb27b09897cf9e54103749e64e64feb6503e1d25a00bf7da498e40207d8d220af8aca134df6fb281484bd8c8444d256f04ddc39de6a23ca1f DIST icon-9.5.20i.tar.gz 3138826 BLAKE2B adb4010926f2a7bbfc03c12c1c669ac202c41949556fafdf8f6e41be418e329c5c4b0697a1af0eddd0cb6acd65d03dedabf171be99ba6e5c80a92fac91323027 SHA512 31f43f0ff672e81b459c8364960b780733820000c31405ddcd13d14927f065b48d1fae47aeb90a2cd31b65340c77ec7f85e8da27797fb186fa49474e7c8be394 -DIST icon-v951src.tgz 3133040 BLAKE2B 790a66a8210c1b9c55514a560590f08d3e52d7c5115d60554183f1118b5705fc1754b8188dcc3b5b739318374d568b6eafc1e3c4266de5416709e7ce6056925b SHA512 032dc9cfa57af5af2eb84b2116d0537124b5efb87b7cf744ecace2ccf49e461d5be5f91df99d85e8a988520d144fe4ecf06a6e78f7fff997b78afa95355449ad diff --git a/dev-lang/icon/files/icon-9.5.1-flags.patch b/dev-lang/icon/files/icon-9.5.1-flags.patch deleted file mode 100644 index ff659b28bbc..00000000000 --- a/dev-lang/icon/files/icon-9.5.1-flags.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- icon-v951src/ipl/cfuncs/Makefile -+++ icon-v951src/ipl/cfuncs/Makefile -@@ -25,7 +25,7 @@ - # library - - $(FUNCLIB): $(FUNCS) mklib.sh -- CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../bin" \ -+ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../bin" \ - sh mklib.sh $(FUNCLIB) $(FUNCS) - $(FUNCS): icall.h - ---- icon-v951src/ipl/cfuncs/mklib.sh -+++ icon-v951src/ipl/cfuncs/mklib.sh -@@ -12,7 +12,7 @@ - set -x - case "$SYS" in - Linux*|*BSD*|GNU*) -- $CC -shared -o $LIBNAME -fPIC "$@";; -+ $CC -shared -o $LIBNAME $CFLAGS $LDFLAGS -fPIC "$@";; - CYGWIN*) - # move the win32 import library for iconx.exe callbacks - # created when iconx.exe was built ---- icon-v951src/ipl/packs/loadfunc/Makefile -+++ icon-v951src/ipl/packs/loadfunc/Makefile -@@ -28,7 +28,7 @@ - echo '$$define FUNCLIB "./$(FUNCLIB)"' >libnames.icn - - $(FUNCLIB): $(FUNCS) -- CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../../bin" \ -+ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../../bin" \ - sh $(MKLIB) $(FUNCLIB) $(FUNCS) - - ---- icon-v951src/src/common/Makefile -+++ icon-v951src/src/common/Makefile -@@ -8,7 +8,7 @@ - common: $(OBJS) gpxmaybe - - patchstr: patchstr.c -- $(CC) $(CFLAGS) -o patchstr patchstr.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o patchstr patchstr.c - - gpxmaybe: - -if [ "x$(XL)" != "x" ]; then $(MAKE) $(GDIR); fi -@@ -25,7 +25,7 @@ - ../h/typedefs.h ../h/mproto.h ../h/cpuconf.h - - ../h/arch.h: infer.c -- $(CC) $(CFLAGS) -o infer infer.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o infer infer.c - ./infer >../h/arch.h - - identify.o: ../h/version.h ---- icon-v951src/src/rtt/Makefile -+++ icon-v951src/src/rtt/Makefile -@@ -22,7 +22,7 @@ - - - rtt: $(OBJ) -- $(CC) $(LDFLAGS) -o rtt $(OBJ) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o rtt $(OBJ) - - library: $(OBJ) - rm -rf rtt.a ---- icon-v951src/src/runtime/Makefile -+++ icon-v951src/src/runtime/Makefile -@@ -30,7 +30,7 @@ - - iconx: $(COBJS) $(XOBJS) - cd ../common; $(MAKE) -- $(CC) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS) - cp iconx ../../bin - strip $(SFLAGS) ../../bin/iconx$(EXE) - diff --git a/dev-lang/icon/files/icon-9.5.1-fpoll.patch b/dev-lang/icon/files/icon-9.5.1-fpoll.patch deleted file mode 100644 index d2a4d5f33d2..00000000000 --- a/dev-lang/icon/files/icon-9.5.1-fpoll.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/ipl/cfuncs/fpoll.c b/ipl/cfuncs/fpoll.c -index 9230e18..33b8121 100644 ---- a/ipl/cfuncs/fpoll.c -+++ b/ipl/cfuncs/fpoll.c -@@ -60,12 +60,9 @@ int fpoll(int argc, descriptor *argv) /*: await data from file */ - - /* check for data already in buffer */ - /* there's no legal way to do this in C; we cheat */ --#if defined(__GLIBC__) && defined(_STDIO_USES_IOSTREAM) /* new GCC library */ -+#if defined(__GLIBC__) /* New GCC library */ - if (f->_IO_read_ptr < f->_IO_read_end) - RetArg(1); --#elif defined(__GLIBC__) /* old GCC library */ -- if (f->__bufp < f->__get_limit) -- RetArg(1); - #elif defined(_FSTDIO) /* new BSD library */ - if (f->_r > 0) - RetArg(1); -@@ -92,7 +89,7 @@ int fpoll(int argc, descriptor *argv) /*: await data from file */ - - if (r > 0) - RetArg(1); /* success */ -- else if (r == 0) -+ else if (r == 0) - Fail; /* timeout */ - else - ArgError(1, 214); /* I/O error */ diff --git a/dev-lang/icon/files/icon-9.5.1-musl.patch b/dev-lang/icon/files/icon-9.5.1-musl.patch deleted file mode 100644 index 16fc9df0173..00000000000 --- a/dev-lang/icon/files/icon-9.5.1-musl.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uprN a/ipl/cfuncs/fpoll.c b/ipl/cfuncs/fpoll.c ---- a/ipl/cfuncs/fpoll.c 2020-05-10 21:46:39.730752626 -0600 -+++ b/ipl/cfuncs/fpoll.c 2020-05-10 21:50:41.613577816 -0600 -@@ -33,6 +33,10 @@ - #include <sys/types.h> - #include <sys/time.h> - -+#if defined(_MUSL) -+# include <stdio_ext.h> -+#endif -+ - #include "icall.h" - - int fpoll(int argc, descriptor *argv) /*: await data from file */ -@@ -66,6 +70,9 @@ int fpoll(int argc, descriptor *argv) /* - #elif defined(_FSTDIO) /* new BSD library */ - if (f->_r > 0) - RetArg(1); -+#elif defined(_MUSL) /* MUSL library */ -+ if (__freadahead(f)) -+ RetArg(1); - #else /* old AT&T library */ - if (f->_cnt > 0) - RetArg(1); diff --git a/dev-lang/icon/icon-9.5.1-r1.ebuild b/dev-lang/icon/icon-9.5.1-r1.ebuild deleted file mode 100644 index 1979b93bc02..00000000000 --- a/dev-lang/icon/icon-9.5.1-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="very high level language" -HOMEPAGE="http://www.cs.arizona.edu/icon/"; - -MY_PV=${PV//./} -SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon-v${MY_PV}src.tgz"; - -LICENSE="public-domain HPND" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="X iplsrc" - -S="${WORKDIR}/icon-v${MY_PV}src" - -RDEPEND=" - X? ( x11-libs/libX11:= )" -DEPEND=" - ${RDEPEND} - X? ( - x11-libs/libXpm - x11-libs/libXt - )" - -PATCHES=( "${FILESDIR}"/${PN}-9.5.1-flags.patch ) - -src_prepare() { - default - - # do not prestrip files - find src -name 'Makefile' | xargs sed -i -e "/strip/d" || die -} - -src_configure() { - # select the right compile target. Note there are many platforms - # available - local mytarget; - if [[ ${CHOST} == *-darwin* ]]; then - mytarget="macintosh" - else - mytarget="linux" - fi - - # Fails if more then one make job process. - # This is an upstream requirement. - emake -j1 $(usex X X-Configure Configure) name=${mytarget} - - # sanitise the Makedefs file generated by Configure - sed -i \ - -e 's:-L/usr/X11R6/lib64::g' \ - -e 's:-L/usr/X11R6/lib::g' \ - -e 's:-I/usr/X11R6/include::g' \ - Makedefs || die "sed of Makedefs failed" - - append-flags $(test-flags -fno-strict-aliasing -fwrapv) -} - -src_compile() { - # Fails if more then one make job process. - # This is an upstream requirement. - emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_test() { - emake Samples - emake Test -} - -src_install() { - # Needed for make Install - dodir /usr/$(get_libdir) - - emake Install dest="${D}/usr/$(get_libdir)/icon" - dosym ../$(get_libdir)/icon/bin/icont /usr/bin/icont - dosym ../$(get_libdir)/icon/bin/iconx /usr/bin/iconx - dosym ../$(get_libdir)/icon/bin/icon /usr/bin/icon - dosym ../$(get_libdir)/icon/bin/vib /usr/bin/vib - - cd "${S}/man/man1" || die - doman "${PN}"t.1 - doman "${PN}".1 - - cd "${S}/doc" || die - DOCS=( *.txt ../README ) - - HTML_DOCS=( *.{htm,gif,jpg,css} ) - einstalldocs - - # Clean up items from make Install that get installed elsewhere - rm -rf "${ED}"/usr/$(get_libdir)/${PN}/man || die - rm -rf "${ED}"/usr/$(get_libdir)/icon/{doc,README} || die - - # optional Icon Programming Library - if use iplsrc; then - cd "${S}" || die - - # Remove unneeded files before copy - rm -fv ipl/{BuildBin,BuildExe,CheckAll,Makefile} || die - - insinto /usr/$(get_libdir)/icon - doins -r ipl - fi -} diff --git a/dev-lang/icon/icon-9.5.1-r2.ebuild b/dev-lang/icon/icon-9.5.1-r2.ebuild deleted file mode 100644 index 31a7c5566c0..00000000000 --- a/dev-lang/icon/icon-9.5.1-r2.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="very high level language" -HOMEPAGE="http://www.cs.arizona.edu/icon/"; - -MY_PV=${PV//./} -SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon-v${MY_PV}src.tgz"; - -LICENSE="public-domain HPND" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="X iplsrc" - -S="${WORKDIR}/icon-v${MY_PV}src" - -RDEPEND=" - X? ( x11-libs/libX11:= )" -DEPEND=" - ${RDEPEND} - X? ( - x11-libs/libXpm - x11-libs/libXt - )" - -PATCHES=( - "${FILESDIR}"/${PN}-9.5.1-flags.patch - # https://bugs.gentoo.org/669330 - # Fix glibc 2.28 problem. - # Patch has been accepted upstream, but is not yet in a release - "${FILESDIR}"/${PN}-9.5.1-fpoll.patch - - # https://bugs.gentoo.org/716212 - # Fix building with musl - # Patch has been accepted upstream, but is not yet in a release - "${FILESDIR}"/${PN}-9.5.1-musl.patch -) - -src_prepare() { - default - - # do not prestrip files - find src -name 'Makefile' | xargs sed -i -e "/strip/d" || die -} - -src_configure() { - # select the right compile target. Note there are many platforms - # available - local mytarget; - if [[ ${CHOST} == *-darwin* ]]; then - mytarget="macintosh" - else - mytarget="linux" - fi - - # Fails if more then one make job process. - # This is an upstream requirement. - emake -j1 $(usex X X-Configure Configure) name=${mytarget} - - # sanitise the Makedefs file generated by Configure - sed -i \ - -e 's:-L/usr/X11R6/lib64::g' \ - -e 's:-L/usr/X11R6/lib::g' \ - -e 's:-I/usr/X11R6/include::g' \ - -e 's:-I/usr/X11R6/include::g' \ - -e '/^CFLAGS/d' \ - Makedefs || die "sed of Makedefs failed" - - if use elibc_musl; then - append-flags "-D_MUSL" - fi - append-flags $(test-flags -fno-strict-aliasing -fwrapv) -} - -src_compile() { - # Fails if more then one make job process. - # This is an upstream requirement. - emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_test() { - emake Samples - emake Test -} - -src_install() { - # Needed for make Install - dodir /usr/$(get_libdir) - - emake Install dest="${D}/usr/$(get_libdir)/icon" - dosym ../$(get_libdir)/icon/bin/icont /usr/bin/icont - dosym ../$(get_libdir)/icon/bin/iconx /usr/bin/iconx - dosym ../$(get_libdir)/icon/bin/icon /usr/bin/icon - if use X; then - dosym ../$(get_libdir)/icon/bin/vib /usr/bin/vib - fi - - cd "${S}/man/man1" || die - doman "${PN}"t.1 - doman "${PN}".1 - - cd "${S}/doc" || die - DOCS=( *.txt ../README ) - - HTML_DOCS=( *.{htm,gif,jpg,css} ) - einstalldocs - - # Clean up items from make Install that get installed elsewhere - rm -rf "${ED}"/usr/$(get_libdir)/${PN}/man || die - rm -rf "${ED}"/usr/$(get_libdir)/icon/{doc,README} || die - - # optional Icon Programming Library - if use iplsrc; then - cd "${S}" || die - - # Remove unneeded files before copy - rm -fv ipl/{BuildBin,BuildExe,CheckAll,Makefile} || die - - insinto /usr/$(get_libdir)/icon - doins -r ipl - fi -} diff --git a/dev-lang/icon/icon-9.5.20h.ebuild b/dev-lang/icon/icon-9.5.20h.ebuild deleted file mode 100644 index ff1ccfcca93..00000000000 --- a/dev-lang/icon/icon-9.5.20h.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="very high level language" -HOMEPAGE="http://www.cs.arizona.edu/icon/"; - -SRC_URI="https://github.com/gtownsend/icon/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="public-domain HPND" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="X iplsrc" - -S="${WORKDIR}/icon-${PV}" - -RDEPEND=" - X? ( x11-libs/libX11:= )" -DEPEND=" - ${RDEPEND} - X? ( - x11-libs/libXpm - x11-libs/libXt - )" - -src_prepare() { - default - # Add CFLAGS and LDFLAGS to Makefiles as needed - sed -i -e 's/CFLAGS="$(CFLAGS)"/& LDFLAGS="$(LDFLAGS)"/g' ipl/cfuncs/Makefile || die - sed -i -e 's/^CFLAGS = \(.*\)/CFLAGS = $(CFLAGS) \1/g' ipl/packs/loadfunc/Makefile || die - sed -i -e 's/CFLAGS="$(CFLAGS)"/& LDFLAGS="$(LDFLAGS)"/g' ipl/packs/loadfunc/Makefile || die - sed -i -e 's/-o $LIBNAME $CFLAGS/& $LDFLAGS/g' ipl/cfuncs/mklib.sh || die - sed -i -e 's/$(RLINK)/& $(LDFLAGS)/g' src/runtime/Makefile || die - - # executables in src/common are only used to prep the build - sed -i -e 's/$(CC) $(CFLAGS)/& $(LDFLAGS)/g' src/common/Makefile || die - # executables in src/rtt are only used to perform the build - sed -i -e 's/$(CC) $(CFLAGS)/& $(LDFLAGS)/g' src/rtt/Makefile || die - - # do not prestrip files - find src -name 'Makefile' | xargs sed -i -e "/strip/d" || die -} - -src_configure() { - # select the right compile target. Note there are many platforms - # available - local mytarget; - if [[ ${CHOST} == *-darwin* ]]; then - mytarget="macintosh" - else - mytarget="linux" - fi - - # Fails if more then one make job process. - # This is an upstream requirement. - emake -j1 $(usex X X-Configure Configure) name=${mytarget} - - # sanitise the Makedefs file generated by Configure - sed -i \ - -e 's:-L/usr/X11R6/lib64::g' \ - -e 's:-L/usr/X11R6/lib::g' \ - -e 's:-I/usr/X11R6/include::g' \ - -e 's:-I/usr/X11R6/include::g' \ - -e '/^CFLAGS/d' \ - Makedefs || die "sed of Makedefs failed" - - if use elibc_musl; then - append-flags "-D_MUSL" - fi - append-flags $(test-flags -fno-strict-aliasing -fwrapv) -} - -src_compile() { - # Fails if more then one make job process. - # This is an upstream requirement. - emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_test() { - emake Samples - emake Test -} - -src_install() { - # Needed for make Install - dodir /usr/$(get_libdir) - - emake Install dest="${D}/usr/$(get_libdir)/icon" - dosym ../$(get_libdir)/icon/bin/icont /usr/bin/icont - dosym ../$(get_libdir)/icon/bin/iconx /usr/bin/iconx - dosym ../$(get_libdir)/icon/bin/icon /usr/bin/icon - if use X; then - dosym ../$(get_libdir)/icon/bin/vib /usr/bin/vib - fi - - cd "${S}/man/man1" || die - doman "${PN}"t.1 - doman "${PN}".1 - - cd "${S}/doc" || die - DOCS=( *.txt ../README ) - - HTML_DOCS=( *.{htm,gif,jpg,css} ) - einstalldocs - - # Clean up items from make Install that get installed elsewhere - rm -rf "${ED}"/usr/$(get_libdir)/${PN}/man || die - rm -rf "${ED}"/usr/$(get_libdir)/icon/{doc,README} || die - - # optional Icon Programming Library - if use iplsrc; then - cd "${S}" || die - - # Remove unneeded files before copy - rm -fv ipl/{BuildBin,BuildExe,CheckAll,Makefile} || die - - insinto /usr/$(get_libdir)/icon - doins -r ipl - fi -} diff --git a/dev-lang/icon/metadata.xml b/dev-lang/icon/metadata.xml index ef9a3d79799..257ee943430 100644 --- a/dev-lang/icon/metadata.xml +++ b/dev-lang/icon/metadata.xml @@ -9,7 +9,4 @@ <email>[email protected]</email> <name>Gentoo Proxy Maintainers Project</name> </maintainer> - <use> - <flag name="iplsrc">install the icon programming library source</flag> - </use> </pkgmetadata>
