[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: f7179e9986c533d227affe26d3db1d8ac26474d2 Author: Joonas Niilola gentoo org> AuthorDate: Wed Aug 17 16:13:49 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Aug 17 16:17:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7179e99 dev-lang/icon: shuffle dependencies on 9.5.22e to make them correct Signed-off-by: Joonas Niilola gentoo.org> dev-lang/icon/icon-9.5.22e.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-lang/icon/icon-9.5.22e.ebuild b/dev-lang/icon/icon-9.5.22e.ebuild index 1b2e774b89d3..725a2f3acb18 100644 --- a/dev-lang/icon/icon-9.5.22e.ebuild +++ b/dev-lang/icon/icon-9.5.22e.ebuild @@ -18,13 +18,13 @@ IUSE="X" S="${WORKDIR}/icon-${PV}" RDEPEND=" - X? ( x11-libs/libX11:= )" -DEPEND=" - ${RDEPEND} X? ( + x11-libs/libX11 x11-libs/libXpm - x11-libs/libXt )" +DEPEND=" + ${RDEPEND} + X? ( x11-libs/libXt )" src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 143d1b6ef04d200c7509306e66ba65af66da4564 Author: Cheyenne Wills witznd net> AuthorDate: Fri Jul 22 19:01:43 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Aug 17 16:17:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=143d1b6e dev-lang/icon: 9.5.22e bump Closes: https://bugs.gentoo.org/862552 Signed-off-by: Cheyenne Wills witznd.net> Closes: https://github.com/gentoo/gentoo/pull/26578 Signed-off-by: Joonas Niilola gentoo.org> dev-lang/icon/Manifest| 1 + dev-lang/icon/icon-9.5.22e.ebuild | 123 ++ 2 files changed, 124 insertions(+) diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest index 2502efd64bd8..c1c6b81ed42c 100644 --- a/dev-lang/icon/Manifest +++ b/dev-lang/icon/Manifest @@ -1,2 +1,3 @@ DIST icon-9.5.20i.tar.gz 3138826 BLAKE2B adb4010926f2a7bbfc03c12c1c669ac202c41949556fafdf8f6e41be418e329c5c4b0697a1af0eddd0cb6acd65d03dedabf171be99ba6e5c80a92fac91323027 SHA512 31f43f0ff672e81b459c8364960b78073382c31405ddcd13d14927f065b48d1fae47aeb90a2cd31b65340c77ec7f85e8da27797fb186fa49474e7c8be394 DIST icon-9.5.21b.tar.gz 3138053 BLAKE2B dbd507e28d51458b4e7fcc47088e8e8a4b8e1ef06a03af95180f3398caf7a74215a379d4a1c19632a501849e9a9226bd129f6404d4d20385bd07f474908b0745 SHA512 db54b0f858c32877bd72dea8c3cec06de7faaa0393ae56a19f6d6a212337c99ef50d698ef0b486369955f86d657a2e888a8b1c4e0e95328f5a67fbd9dce5d74b +DIST icon-9.5.22e.tar.gz 3088775 BLAKE2B 0f0019f4f4bc0ed695bcb99d927c57e1fe041047d2b2e74590d23b4cb032aa4d459f916e3571a294e6d98d68be16bc55828337320173abfb5220fc4470d54903 SHA512 2a718999e7fc3f1cc2ad745215a06fecb5865f890ff83e8e61c8408df0bec2dea0c3123ab1edc0c3a9ec3cd415ca0fd116c5ff93c8ce0797a5f2abf5ff79003c diff --git a/dev-lang/icon/icon-9.5.22e.ebuild b/dev-lang/icon/icon-9.5.22e.ebuild new file mode 100644 index ..1b2e774b89d3 --- /dev/null +++ b/dev-lang/icon/icon-9.5.22e.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +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/$LIBNAME -fPIC/$LIBNAME -fPIC $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' -exec 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 'make 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) + +
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 245f4901b17e0cc4087b17834a3df1a84fe0bd58 Author: Thamognya Kodi thamognya com> AuthorDate: Fri Jun 17 02:10:57 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Jul 2 17:35:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=245f4901 dev-lang/icon: bump to 9.5.21b Signed-off-by: Thamognya Kodi thamognya.com> Closes: https://github.com/gentoo/gentoo/pull/25932 Signed-off-by: Joonas Niilola gentoo.org> dev-lang/icon/Manifest| 1 + dev-lang/icon/icon-9.5.21b.ebuild | 123 ++ 2 files changed, 124 insertions(+) diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest index 965e85ae01b5..2502efd64bd8 100644 --- a/dev-lang/icon/Manifest +++ b/dev-lang/icon/Manifest @@ -1 +1,2 @@ DIST icon-9.5.20i.tar.gz 3138826 BLAKE2B adb4010926f2a7bbfc03c12c1c669ac202c41949556fafdf8f6e41be418e329c5c4b0697a1af0eddd0cb6acd65d03dedabf171be99ba6e5c80a92fac91323027 SHA512 31f43f0ff672e81b459c8364960b78073382c31405ddcd13d14927f065b48d1fae47aeb90a2cd31b65340c77ec7f85e8da27797fb186fa49474e7c8be394 +DIST icon-9.5.21b.tar.gz 3138053 BLAKE2B dbd507e28d51458b4e7fcc47088e8e8a4b8e1ef06a03af95180f3398caf7a74215a379d4a1c19632a501849e9a9226bd129f6404d4d20385bd07f474908b0745 SHA512 db54b0f858c32877bd72dea8c3cec06de7faaa0393ae56a19f6d6a212337c99ef50d698ef0b486369955f86d657a2e888a8b1c4e0e95328f5a67fbd9dce5d74b diff --git a/dev-lang/icon/icon-9.5.21b.ebuild b/dev-lang/icon/icon-9.5.21b.ebuild new file mode 100644 index ..06cf626294d8 --- /dev/null +++ b/dev-lang/icon/icon-9.5.21b.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +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/$LIBNAME -fPIC/$LIBNAME -fPIC $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' -exec 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 'make 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
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/files/, dev-lang/icon/
commit: 5e11652b042407cf4cbf10617cab42cf4f7f67f1 Author: Cheyenne Wills witznd net> AuthorDate: Mon Oct 4 23:04:16 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Oct 8 11:53:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e11652b dev-lang/icon: Remove old Signed-off-by: Cheyenne Wills witznd.net> Closes: https://github.com/gentoo/gentoo/pull/22491 Signed-off-by: Ionen Wolkens 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 31f43f0ff672e81b459c8364960b78073382c31405ddcd13d14927f065b48d1fae47aeb90a2cd31b65340c77ec7f85e8da27797fb186fa49474e7c8be394 -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..000 --- 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..000 ---
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 4559b4048f673495477adeb8244c437dbda69d28 Author: Sam James gentoo org> AuthorDate: Sat Sep 25 23:45:29 2021 + Commit: Sam James gentoo org> CommitDate: Sat Sep 25 23:45:58 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4559b404 dev-lang/icon: Stabilize 9.5.20i x86, #814059 Signed-off-by: Sam James gentoo.org> dev-lang/icon/icon-9.5.20i.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/icon/icon-9.5.20i.ebuild b/dev-lang/icon/icon-9.5.20i.ebuild index 7eb92556378..10b99668ef4 100644 --- a/dev-lang/icon/icon-9.5.20i.ebuild +++ b/dev-lang/icon/icon-9.5.20i.ebuild @@ -12,7 +12,7 @@ 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" +KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="X" S="${WORKDIR}/icon-${PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 2201ece3f05313c88e79e7ae235a46e67d44ada7 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 25 05:16:45 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 25 05:16:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2201ece3 dev-lang/icon: ppc stable wrt bug #814059 Package-Manager: Portage-3.0.20, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> dev-lang/icon/icon-9.5.20i.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/icon/icon-9.5.20i.ebuild b/dev-lang/icon/icon-9.5.20i.ebuild index 1ba5fef5634..7eb92556378 100644 --- a/dev-lang/icon/icon-9.5.20i.ebuild +++ b/dev-lang/icon/icon-9.5.20i.ebuild @@ -12,7 +12,7 @@ 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" +KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="X" S="${WORKDIR}/icon-${PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 93b87af921f609db56688294ce05f0d053055582 Author: Sam James gentoo org> AuthorDate: Fri Sep 24 22:46:26 2021 + Commit: Sam James gentoo org> CommitDate: Fri Sep 24 22:46:26 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93b87af9 dev-lang/icon: Stabilize 9.5.20i amd64, #814059 Signed-off-by: Sam James gentoo.org> dev-lang/icon/icon-9.5.20i.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/icon/icon-9.5.20i.ebuild b/dev-lang/icon/icon-9.5.20i.ebuild index 434c138911e..fa824051de1 100644 --- a/dev-lang/icon/icon-9.5.20i.ebuild +++ b/dev-lang/icon/icon-9.5.20i.ebuild @@ -12,7 +12,7 @@ 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" +KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="X" S="${WORKDIR}/icon-${PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: f9fb33ad526df55d8d98dce0e95835ee46f35a10 Author: Sam James gentoo org> AuthorDate: Fri Sep 24 22:47:22 2021 + Commit: Sam James gentoo org> CommitDate: Fri Sep 24 22:47:22 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9fb33ad dev-lang/icon: Stabilize 9.5.20i ppc64, #814059 Signed-off-by: Sam James gentoo.org> dev-lang/icon/icon-9.5.20i.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/icon/icon-9.5.20i.ebuild b/dev-lang/icon/icon-9.5.20i.ebuild index fa824051de1..1ba5fef5634 100644 --- a/dev-lang/icon/icon-9.5.20i.ebuild +++ b/dev-lang/icon/icon-9.5.20i.ebuild @@ -12,7 +12,7 @@ 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" +KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="X" S="${WORKDIR}/icon-${PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 481608abb1f460dc7ea610cb3ce9a67a41afbc43 Author: Rolf Eike Beer sf-mail de> AuthorDate: Wed Sep 22 15:07:37 2021 + Commit: Sam James gentoo org> CommitDate: Wed Sep 22 18:03:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=481608ab dev-lang/icon: stable 9.5.20i for hppa/sparc, bug #814059 Package-Manager: Portage-3.0.20, Repoman-3.0.3 RepoMan-Options: --include-arches="hppa sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sam James gentoo.org> dev-lang/icon/icon-9.5.20i.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/icon/icon-9.5.20i.ebuild b/dev-lang/icon/icon-9.5.20i.ebuild index ba49cb68f23..434c138911e 100644 --- a/dev-lang/icon/icon-9.5.20i.ebuild +++ b/dev-lang/icon/icon-9.5.20i.ebuild @@ -12,7 +12,7 @@ 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" +KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="X" S="${WORKDIR}/icon-${PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 7bdf254f6c23c7b61fd04a08c5dc93110344e022 Author: Joonas Niilola gentoo org> AuthorDate: Mon Mar 15 07:41:55 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Mar 15 07:45:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bdf254f dev-lang/icon: local DOCS local HTML_DOCS, update description 9.5.20i Signed-off-by: Joonas Niilola gentoo.org> dev-lang/icon/icon-9.5.20i.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-lang/icon/icon-9.5.20i.ebuild b/dev-lang/icon/icon-9.5.20i.ebuild index 5952782ccf9..ba49cb68f23 100644 --- a/dev-lang/icon/icon-9.5.20i.ebuild +++ b/dev-lang/icon/icon-9.5.20i.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit flag-o-matic toolchain-funcs -DESCRIPTION="very high level language" +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" @@ -102,9 +102,9 @@ src_install() { doman "${PN}".1 cd "${S}/doc" || die - DOCS=( *.txt ../README ) + local DOCS=( *.txt ../README ) - HTML_DOCS=( *.{htm,gif,jpg,css} ) + local HTML_DOCS=( *.{htm,gif,jpg,css} ) einstalldocs # Clean up items from make Install that get installed elsewhere
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: b42a60cda48bc95e8f0dc40dcf4248f402a039fd Author: Cheyenne Wills witznd net> AuthorDate: Sat Mar 13 22:58:06 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Mar 15 07:45:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b42a60cd dev-lang/icon: bump version to 9.5.20i Update to current upstream version (9.5.20i) Ebuild updated to correct missing LDFLAG when building libcfuncs as mentioned in #737296 Bug:https://bugs.gentoo.org/775896 Signed-off-by: Cheyenne Wills witznd.net> Closes: https://github.com/gentoo/gentoo/pull/19922 Signed-off-by: Joonas Niilola gentoo.org> dev-lang/icon/Manifest| 1 + dev-lang/icon/icon-9.5.20i.ebuild | 123 ++ 2 files changed, 124 insertions(+) diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest index ca1e99e8a18..85152f23b6f 100644 --- a/dev-lang/icon/Manifest +++ b/dev-lang/icon/Manifest @@ -1,2 +1,3 @@ DIST icon-9.5.20h.tar.gz 3137602 BLAKE2B 093290f7df4d0c1686b57c1debabdae5ab607fab00849885fd97b68b872db9d360e9ffe61b7be2e503f5ffa70a387011128c65586b0d48e298577d0ca690a729 SHA512 c3dec5d9d6f2e01fb27b09897cf9e54103749e64e64feb6503e1d25a00bf7da498e40207d8d220af8aca134df6fb281484bd8c8444d256f04ddc39de6a23ca1f +DIST icon-9.5.20i.tar.gz 3138826 BLAKE2B adb4010926f2a7bbfc03c12c1c669ac202c41949556fafdf8f6e41be418e329c5c4b0697a1af0eddd0cb6acd65d03dedabf171be99ba6e5c80a92fac91323027 SHA512 31f43f0ff672e81b459c8364960b78073382c31405ddcd13d14927f065b48d1fae47aeb90a2cd31b65340c77ec7f85e8da27797fb186fa49474e7c8be394 DIST icon-v951src.tgz 3133040 BLAKE2B 790a66a8210c1b9c55514a560590f08d3e52d7c5115d60554183f1118b5705fc1754b8188dcc3b5b739318374d568b6eafc1e3c4266de5416709e7ce6056925b SHA512 032dc9cfa57af5af2eb84b2116d0537124b5efb87b7cf744ecace2ccf49e461d5be5f91df99d85e8a988520d144fe4ecf06a6e78f7fff997b78afa95355449ad diff --git a/dev-lang/icon/icon-9.5.20i.ebuild b/dev-lang/icon/icon-9.5.20i.ebuild new file mode 100644 index 000..5952782ccf9 --- /dev/null +++ b/dev-lang/icon/icon-9.5.20i.ebuild @@ -0,0 +1,123 @@ +# 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" + +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/$LIBNAME -fPIC/$LIBNAME -fPIC $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' -exec 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 'make 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() { +
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 0050f8dfda95f7da8f70a46b1ac3218d1e3daef5 Author: Cheyenne Wills witznd net> AuthorDate: Thu Aug 6 05:07:17 2020 + Commit: Sam James gentoo org> CommitDate: Sat Aug 15 00:46:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0050f8df dev-lang/icon bump to 9.5.20h Upstream has switched over from an "infrequent formal release to a system of continual modifications that are immediately available publicly through Github". Going forward upstream will tag the repo and set the version number to "9.5.yyx" where yy is the last two digits of the year and x is an alphabetic sequence character within the year (e.g. 9.5.20h). Create a new ebuild for icon-9.5.20h that supports the new upstream source and follows upstream versioning. Replace the use of the patches and use inline sed commands to modify the Makefiles to follow Gentoo's CFLAGS/LDFLAGS policies. The changes associated with #669330, #716212 and #732507 are included in the upstream source. Bug:https://bugs.gentoo.org/736096 Signed-off-by: Cheyenne Wills witznd.net> Closes: https://github.com/gentoo/gentoo/pull/17026 Signed-off-by: Sam James gentoo.org> dev-lang/icon/Manifest| 1 + dev-lang/icon/icon-9.5.20h.ebuild | 123 ++ 2 files changed, 124 insertions(+) diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest index 5d01276f401..ca1e99e8a18 100644 --- a/dev-lang/icon/Manifest +++ b/dev-lang/icon/Manifest @@ -1 +1,2 @@ +DIST icon-9.5.20h.tar.gz 3137602 BLAKE2B 093290f7df4d0c1686b57c1debabdae5ab607fab00849885fd97b68b872db9d360e9ffe61b7be2e503f5ffa70a387011128c65586b0d48e298577d0ca690a729 SHA512 c3dec5d9d6f2e01fb27b09897cf9e54103749e64e64feb6503e1d25a00bf7da498e40207d8d220af8aca134df6fb281484bd8c8444d256f04ddc39de6a23ca1f DIST icon-v951src.tgz 3133040 BLAKE2B 790a66a8210c1b9c55514a560590f08d3e52d7c5115d60554183f1118b5705fc1754b8188dcc3b5b739318374d568b6eafc1e3c4266de5416709e7ce6056925b SHA512 032dc9cfa57af5af2eb84b2116d0537124b5efb87b7cf744ecace2ccf49e461d5be5f91df99d85e8a988520d144fe4ecf06a6e78f7fff997b78afa95355449ad diff --git a/dev-lang/icon/icon-9.5.20h.ebuild b/dev-lang/icon/icon-9.5.20h.ebuild new file mode 100644 index 000..1c915dca803 --- /dev/null +++ b/dev-lang/icon/icon-9.5.20h.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2020 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 ~x86-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
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 1597004200e7bc42454ce57ebf9670676f6aa76b Author: Cheyenne Wills witznd net> AuthorDate: Fri May 29 13:31:52 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Jun 4 13:35:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15970042 dev-lang/icon: fix broken symlink when USE=-X Skips adding symlink to vib if graphics support is not enabled. Closes: https://bugs.gentoo.org/723066 Signed-off-by: Cheyenne Wills witznd.net> Closes: https://github.com/gentoo/gentoo/pull/15671 Signed-off-by: Joonas Niilola gentoo.org> dev-lang/icon/icon-9.5.1-r2.ebuild | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-lang/icon/icon-9.5.1-r2.ebuild b/dev-lang/icon/icon-9.5.1-r2.ebuild index d76ac046eb3..d986c29147b 100644 --- a/dev-lang/icon/icon-9.5.1-r2.ebuild +++ b/dev-lang/icon/icon-9.5.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -95,7 +95,9 @@ src_install() { 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 + if use X; then + dosym ../$(get_libdir)/icon/bin/vib /usr/bin/vib + fi cd "${S}/man/man1" || die doman "${PN}"t.1
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/files/, dev-lang/icon/
commit: ee19109f17c12e97eea26c8506538eb246de32ee Author: Cheyenne Wills witznd net> AuthorDate: Mon May 18 04:48:10 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Jun 4 13:34:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee19109f dev-lang/icon: fix for building with sys-libs/musl The Icon Programming Library function fpoll.c fails to build when the sys-libs/musl is being used. fpoll.c is sensitive to the internal layout of the FILE structure. Patch fpoll.c so it will build when sys-libs/musl is used. Since the musl library does not provide a way to detect that the musl library is being used. Update the ebuild to update CFLAGS to include a define that indicates musl is being used. In addition, CFLAGS were being overridden within the build process. Update the ebuild to ensure that the ebuild's CFLAGS are used. Closes: https://bugs.gentoo.org/716212 Signed-off-by: Cheyenne Wills witznd.net> Signed-off-by: Joonas Niilola gentoo.org> dev-lang/icon/files/icon-9.5.1-musl.patch | 24 dev-lang/icon/icon-9.5.1-r2.ebuild| 12 +++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dev-lang/icon/files/icon-9.5.1-musl.patch b/dev-lang/icon/files/icon-9.5.1-musl.patch new file mode 100644 index 000..16fc9df0173 --- /dev/null +++ b/dev-lang/icon/files/icon-9.5.1-musl.patch @@ -0,0 +1,24 @@ +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 + #include + ++#if defined(_MUSL) ++# include ++#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 library */ +if (f->_cnt > 0) + RetArg(1); diff --git a/dev-lang/icon/icon-9.5.1-r2.ebuild b/dev-lang/icon/icon-9.5.1-r2.ebuild index 5f313ed60aa..d76ac046eb3 100644 --- a/dev-lang/icon/icon-9.5.1-r2.ebuild +++ b/dev-lang/icon/icon-9.5.1-r2.ebuild @@ -31,8 +31,13 @@ PATCHES=( "${FILESDIR}"/${PN}-9.5.1-flags.patch # https://bugs.gentoo.org/669330 # Fix glibc 2.28 problem. - # Patch has also been submitted for upstream approval + # 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() { @@ -61,8 +66,13 @@ src_configure() { -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) }
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/files/, dev-lang/icon/
commit: e6208724793683c9c07dd2741483d39797dca1a2 Author: Cheyenne Wills witznd net> AuthorDate: Mon Oct 29 01:10:29 2018 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Dec 2 20:32:47 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6208724 dev-lang/icon: Fixes compile error with glibc 2.28 Added patch pending upstream patch approval Bug: https://bugs.gentoo.org/669330 Closes: https://github.com/gentoo/gentoo/pull/10288 Package-Manager: Portage-2.3.49, Repoman-2.3.11 Signed-off-by: Cheyenne Wills witznd.net> Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/icon/files/icon-9.5.1-fpoll.patch | 27 +++ dev-lang/icon/icon-9.5.1-r2.ebuild | 114 + 2 files changed, 141 insertions(+) diff --git a/dev-lang/icon/files/icon-9.5.1-fpoll.patch b/dev-lang/icon/files/icon-9.5.1-fpoll.patch new file mode 100644 index 000..d2a4d5f33d2 --- /dev/null +++ b/dev-lang/icon/files/icon-9.5.1-fpoll.patch @@ -0,0 +1,27 @@ +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/icon-9.5.1-r2.ebuild b/dev-lang/icon/icon-9.5.1-r2.ebuild new file mode 100644 index 000..5f313ed60aa --- /dev/null +++ b/dev-lang/icon/icon-9.5.1-r2.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2018 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 ~x86-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 also been submitted for upstream approval + "${FILESDIR}"/${PN}-9.5.1-fpoll.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
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/files/, dev-lang/icon/
commit: d060d5ce277e89ba856638a2bcd2c12a7d92a54e Author: Matt Turner gentoo org> AuthorDate: Sun May 20 17:34:22 2018 + Commit: Matt Turner gentoo org> CommitDate: Sun May 20 17:35:03 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d060d5ce dev-lang/icon: Drop old versions Dropping stable ppc, ppc64, and hppa keywords since there are no known users and no reverse dependencies. Closes: https://bugs.gentoo.org/652178 dev-lang/icon/Manifest | 2 - dev-lang/icon/files/icon-9.4.3-flags.patch | 62 dev-lang/icon/files/icon-9.5.0-flags.patch | 75 --- dev-lang/icon/files/tests-943.patch| 113 - dev-lang/icon/icon-9.4.3-r5.ebuild | 108 --- dev-lang/icon/icon-9.5.0-r1.ebuild | 104 -- dev-lang/icon/icon-9.5.0.ebuild| 103 -- dev-lang/icon/icon-9.5.1.ebuild| 102 -- 8 files changed, 669 deletions(-) diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest index 96c5b98d926..5d01276f401 100644 --- a/dev-lang/icon/Manifest +++ b/dev-lang/icon/Manifest @@ -1,3 +1 @@ -DIST icon-v950src.tgz 3115766 BLAKE2B e3dcd0abe76a3d7fe387d1273d8bebadf854dc5cc120b520968d5a5e4970eb63c5142c14ddedbcfcac4e99f372bdc6be8c65f038eb8f38f746ea65a1f7764ba8 SHA512 32f01ca65863525d92846b505ea61f6fbad5a11991d0476c5e79647459dee12746b4448f8d32f2766c198b6713587e48eb0f7f2a942ce42a929f080a85039fa3 DIST icon-v951src.tgz 3133040 BLAKE2B 790a66a8210c1b9c55514a560590f08d3e52d7c5115d60554183f1118b5705fc1754b8188dcc3b5b739318374d568b6eafc1e3c4266de5416709e7ce6056925b SHA512 032dc9cfa57af5af2eb84b2116d0537124b5efb87b7cf744ecace2ccf49e461d5be5f91df99d85e8a988520d144fe4ecf06a6e78f7fff997b78afa95355449ad -DIST icon.v943src.tgz 3218627 BLAKE2B 50ac22659a74adaf8462b75272592465d7bd78d23ebe7f67b362181c777517646806cea6a6c5d8a8fdb904098a5f07d6d630f01c2bf58c258a11401c0263c7da SHA512 9f89c7f1aaea1caea586aeb1ef74346a0f258c26ae74581a9ce7b59c2b590eb79316bdb9530b70d9af59ad06e6c444eec92016d0e5b015f4d467bde0baac2695 diff --git a/dev-lang/icon/files/icon-9.4.3-flags.patch b/dev-lang/icon/files/icon-9.4.3-flags.patch deleted file mode 100644 index cdb5adcd1b4..000 --- a/dev-lang/icon/files/icon-9.4.3-flags.patch +++ /dev/null @@ -1,62 +0,0 @@ icon.v943src/ipl/cfuncs/Makefile -+++ icon.v943src/ipl/cfuncs/Makefile -@@ -25,7 +25,7 @@ - # library - - $(FUNCLIB): $(FUNCS) mklib.sh -- CC="$(CC)" CFLAGS="$(CFLAGS)" sh mklib.sh $(FUNCLIB) $(FUNCS) -+ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" sh mklib.sh $(FUNCLIB) $(FUNCS) - $(FUNCS): icall.h - - icon.v943src/ipl/cfuncs/mklib.sh -+++ icon.v943src/ipl/cfuncs/mklib.sh -@@ -11,7 +11,7 @@ - set -x - case "$SYS" in -Linux*|*BSD*|GNU*) -- gcc -shared -o $LIBNAME -fPIC "$@";; -+ $CC -shared -o $LIBNAME $CFLAGS $LDFLAGS -fPIC "$@";; -Darwin*) - cc -bundle -undefined suppress -flat_namespace -o $LIBNAME "$@";; -SunOS*) icon.v943src/src/common/Makefile -+++ icon.v943src/src/common/Makefile -@@ -8,7 +8,7 @@ - common: doincl $(OBJS) gpxmaybe - - doincl: doincl.c ../h/arch.h -- $(CC) $(CFLAGS) -o doincl doincl.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o doincl doincl.c - -./doincl -o ../../bin/rt.h ../h/rt.h - - patchstr: patchstr.c -@@ -29,7 +29,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 -@@ -46,7 +46,7 @@ - - # for rswitch, $(CFLAGS) is deliberately omitted (-O may cause problems) - rswitch.o: ../h/define.h ../h/arch.h $(RSW) -- $(CC) -c $(RSW) -+ $(CC) $(CFLAGS) -O0 -c $(RSW) - - - # The following section is needed if changes are made to the Icon grammar, icon.v943src/src/runtime/Makefile -+++ icon.v943src/src/runtime/Makefile -@@ -39,7 +39,7 @@ - - iconx: $(OBJS) - cd ../common; $(MAKE) -- $(CC) $(RLINK) -o iconx $(OBJS) $(XL) $(RLIBS) $(TL) -+ $(CC) $(LDFLAGS) $(RLINK) -o iconx $(OBJS) $(XL) $(RLIBS) $(TL) - cp iconx ../../bin - strip $(SFLAGS) ../../bin/iconx$(EXE) - diff --git a/dev-lang/icon/files/icon-9.5.0-flags.patch b/dev-lang/icon/files/icon-9.5.0-flags.patch deleted file mode 100644 index 33fa9485c20..000 --- a/dev-lang/icon/files/icon-9.5.0-flags.patch +++ /dev/null @@ -1,75 +0,0 @@ icon-v950src/ipl/cfuncs/Makefile -+++ icon-v950src/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
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: c85d55dabc4390aa335f0555f8751d5325b11be2 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed May 16 12:21:35 2018 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed May 16 12:21:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c85d55da dev-lang/icon: amd64 stable wrt bug #652178 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="amd64" dev-lang/icon/icon-9.5.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/icon/icon-9.5.1-r1.ebuild b/dev-lang/icon/icon-9.5.1-r1.ebuild index 0da6159b513..726160fc0d1 100644 --- a/dev-lang/icon/icon-9.5.1-r1.ebuild +++ b/dev-lang/icon/icon-9.5.1-r1.ebuild @@ -13,7 +13,7 @@ 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 ~x86-macos" +KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="X iplsrc" S="${WORKDIR}/icon-v${MY_PV}src"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: c238a043967ec2119402ba6d61e8a10d4f37a4d1 Author: Tobias Klausmann gentoo org> AuthorDate: Mon May 14 12:42:23 2018 + Commit: Tobias Klausmann gentoo org> CommitDate: Mon May 14 14:10:56 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c238a043 dev-lang/icon-9.5.1-r1: alpha stable Gentoo-Bug: http://bugs.gentoo.org/652178 dev-lang/icon/icon-9.5.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/icon/icon-9.5.1-r1.ebuild b/dev-lang/icon/icon-9.5.1-r1.ebuild index d0c391d9e48..0da6159b513 100644 --- a/dev-lang/icon/icon-9.5.1-r1.ebuild +++ b/dev-lang/icon/icon-9.5.1-r1.ebuild @@ -13,7 +13,7 @@ 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 ~x86-macos" +KEYWORDS="alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="X iplsrc" S="${WORKDIR}/icon-v${MY_PV}src"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 1b03a8f9e324dfadd2ad66f82471115d022a68c6 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun May 13 21:57:15 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun May 13 22:06:17 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b03a8f9 dev-lang/icon: x86 stable (bug #652178) Package-Manager: Portage-2.3.34, Repoman-2.3.9 dev-lang/icon/icon-9.5.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/icon/icon-9.5.1-r1.ebuild b/dev-lang/icon/icon-9.5.1-r1.ebuild index 58f208b59af..d0c391d9e48 100644 --- a/dev-lang/icon/icon-9.5.1-r1.ebuild +++ b/dev-lang/icon/icon-9.5.1-r1.ebuild @@ -13,7 +13,7 @@ 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 ~x86-macos" +KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="X iplsrc" S="${WORKDIR}/icon-v${MY_PV}src"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: f0e81b5cd3771f7d6a3ddb670ffbeb2dda4d00d7 Author: Rolf Eike Beer sf-mail de> AuthorDate: Sun May 13 06:54:15 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun May 13 09:52:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e81b5c dev-lang/icon: stable 9.5.1-r1 for sparc Bug: https://bugs.gentoo.org/652178 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="sparc" dev-lang/icon/icon-9.5.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/icon/icon-9.5.1-r1.ebuild b/dev-lang/icon/icon-9.5.1-r1.ebuild index eb34218b328..58f208b59af 100644 --- a/dev-lang/icon/icon-9.5.1-r1.ebuild +++ b/dev-lang/icon/icon-9.5.1-r1.ebuild @@ -13,7 +13,7 @@ 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 ~x86-macos" +KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="X iplsrc" S="${WORKDIR}/icon-v${MY_PV}src"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 89d06193ec9f79cf6e8bfc40697e920023eeb2cd Author: Sergei Trofimovich gentoo org> AuthorDate: Sat May 12 15:31:52 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat May 12 15:31:52 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d06193 dev-lang/icon: stable 9.5.1-r1 for ia64, bug #652178 Bug: https://bugs.gentoo.org/652178 Package-Manager: Portage-2.3.36, Repoman-2.3.9 RepoMan-Options: --include-arches="ia64" dev-lang/icon/icon-9.5.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/icon/icon-9.5.1-r1.ebuild b/dev-lang/icon/icon-9.5.1-r1.ebuild index e0752c583f6..eb34218b328 100644 --- a/dev-lang/icon/icon-9.5.1-r1.ebuild +++ b/dev-lang/icon/icon-9.5.1-r1.ebuild @@ -13,7 +13,7 @@ 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 ~x86-macos" +KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="X iplsrc" S="${WORKDIR}/icon-v${MY_PV}src"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: fdc225699198942a0f8f8cb695d79bac8d940158 Author: Matt Turner gentoo org> AuthorDate: Sat Apr 28 00:45:48 2018 + Commit: Matt Turner gentoo org> CommitDate: Sat Apr 28 00:52:19 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdc22569 dev-lang/icon: Drop unnecessary x11-proto dep dev-lang/icon/icon-9.5.1-r1.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev-lang/icon/icon-9.5.1-r1.ebuild b/dev-lang/icon/icon-9.5.1-r1.ebuild index b82e274be20..e0752c583f6 100644 --- a/dev-lang/icon/icon-9.5.1-r1.ebuild +++ b/dev-lang/icon/icon-9.5.1-r1.ebuild @@ -23,8 +23,6 @@ RDEPEND=" DEPEND=" ${RDEPEND} X? ( - x11-proto/xextproto - x11-proto/xproto x11-libs/libXpm x11-libs/libXt )"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 1651eaaf8c8be56333e8b2d460913e27a97a1636 Author: Cheyenne Wills gmail com> AuthorDate: Thu Apr 19 02:41:16 2018 + Commit: David Seifert gentoo org> CommitDate: Fri Apr 20 08:50:30 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1651eaaf dev-lang/icon: EAPI 6 Cleanup * Document rationale for emake -j1 Bug: https://bugs.gentoo.org/652178 Package-Manager: Portage-2.3.24, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/8064 dev-lang/icon/icon-9.5.1-r1.ebuild | 110 + 1 file changed, 110 insertions(+) diff --git a/dev-lang/icon/icon-9.5.1-r1.ebuild b/dev-lang/icon/icon-9.5.1-r1.ebuild new file mode 100644 index 000..b82e274be20 --- /dev/null +++ b/dev-lang/icon/icon-9.5.1-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 ~x86-macos" +IUSE="X iplsrc" + +S="${WORKDIR}/icon-v${MY_PV}src" + +RDEPEND=" + X? ( x11-libs/libX11:= )" +DEPEND=" + ${RDEPEND} + X? ( + x11-proto/xextproto + x11-proto/xproto + 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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: ddf473aa9eb60f1ca830d9f9156407d5b3af819a Author: Michał Górny gentoo org> AuthorDate: Mon Aug 28 21:17:53 2017 + Commit: Michał Górny gentoo org> CommitDate: Mon Aug 28 21:18:23 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddf473aa dev-lang/icon: [QA] Use relative symlink target(s) dev-lang/icon/icon-9.4.3-r5.ebuild | 8 dev-lang/icon/icon-9.5.0-r1.ebuild | 8 dev-lang/icon/icon-9.5.0.ebuild| 8 dev-lang/icon/icon-9.5.1.ebuild| 8 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dev-lang/icon/icon-9.4.3-r5.ebuild b/dev-lang/icon/icon-9.4.3-r5.ebuild index 0fc19f57ac1..505439eaf28 100644 --- a/dev-lang/icon/icon-9.4.3-r5.ebuild +++ b/dev-lang/icon/icon-9.4.3-r5.ebuild @@ -75,10 +75,10 @@ src_install() { dodir /usr/$(get_libdir) make Install dest="${D}/usr/$(get_libdir)/icon" || die "Make install failed" - dosym /usr/$(get_libdir)/icon/bin/icont /usr/bin/icont - dosym /usr/$(get_libdir)/icon/bin/iconx /usr/bin/iconx - dosym /usr/$(get_libdir)/icon/bin/icon /usr/bin/icon - dosym /usr/$(get_libdir)/icon/bin/vib /usr/bin/vib + 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" doman icont.1 diff --git a/dev-lang/icon/icon-9.5.0-r1.ebuild b/dev-lang/icon/icon-9.5.0-r1.ebuild index 4cc1c7794bc..efe23034471 100644 --- a/dev-lang/icon/icon-9.5.0-r1.ebuild +++ b/dev-lang/icon/icon-9.5.0-r1.ebuild @@ -76,10 +76,10 @@ src_install() { dodir /usr/$(get_libdir) make Install dest="${ED}/usr/$(get_libdir)/icon" || die "Make install failed" - dosym /usr/$(get_libdir)/icon/bin/icont /usr/bin/icont - dosym /usr/$(get_libdir)/icon/bin/iconx /usr/bin/iconx - dosym /usr/$(get_libdir)/icon/bin/icon /usr/bin/icon - dosym /usr/$(get_libdir)/icon/bin/vib /usr/bin/vib + 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 diff --git a/dev-lang/icon/icon-9.5.0.ebuild b/dev-lang/icon/icon-9.5.0.ebuild index 636abb19575..9fdaf86bac8 100644 --- a/dev-lang/icon/icon-9.5.0.ebuild +++ b/dev-lang/icon/icon-9.5.0.ebuild @@ -72,10 +72,10 @@ src_install() { dodir /usr/$(get_libdir) make Install dest="${ED}/usr/$(get_libdir)/icon" || die "Make install failed" - dosym /usr/$(get_libdir)/icon/bin/icont /usr/bin/icont - dosym /usr/$(get_libdir)/icon/bin/iconx /usr/bin/iconx - dosym /usr/$(get_libdir)/icon/bin/icon /usr/bin/icon - dosym /usr/$(get_libdir)/icon/bin/vib /usr/bin/vib + 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" doman icont.1 diff --git a/dev-lang/icon/icon-9.5.1.ebuild b/dev-lang/icon/icon-9.5.1.ebuild index 35532908612..1f8a07a1b37 100644 --- a/dev-lang/icon/icon-9.5.1.ebuild +++ b/dev-lang/icon/icon-9.5.1.ebuild @@ -74,10 +74,10 @@ src_install() { dodir /usr/$(get_libdir) make Install dest="${ED}/usr/$(get_libdir)/icon" || die "Make install failed" - dosym /usr/$(get_libdir)/icon/bin/icont /usr/bin/icont - dosym /usr/$(get_libdir)/icon/bin/iconx /usr/bin/iconx - dosym /usr/$(get_libdir)/icon/bin/icon /usr/bin/icon - dosym /usr/$(get_libdir)/icon/bin/vib /usr/bin/vib + 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
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 12c1435f989c3dbbdbd8aa92f8054af12569522b Author: Jason Zaman gentoo org> AuthorDate: Thu Apr 14 04:26:01 2016 + Commit: Jason Zaman gentoo org> CommitDate: Thu Apr 14 06:12:28 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c1435f dev-lang/icon: fix up metadata Package-Manager: portage-2.2.26 dev-lang/icon/metadata.xml | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-lang/icon/metadata.xml b/dev-lang/icon/metadata.xml index 4b1d2db..a50948a 100644 --- a/dev-lang/icon/metadata.xml +++ b/dev-lang/icon/metadata.xml @@ -1,14 +1,16 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - proxy-ma...@gentoo.org - Gentoo Proxy Maintainers Project - cwi...@witznd.net -Cheyenne Wills + Cheyenne Wills Proxied maintainer; set to assignee in all bugs -install the icon programming library source + + proxy-ma...@gentoo.org + Gentoo Proxy Maintainers Project + + + install the icon programming library source +
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/files/, dev-lang/icon/
commit: c6ef21d44cb2201032e592b289c1cfa0d18a0197 Author: Ian Delaney gentoo org> AuthorDate: Wed Feb 17 07:09:32 2016 + Commit: Ian Delaney gentoo org> CommitDate: Wed Feb 17 07:09:55 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6ef21d4 dev-lang/icon: bump to vn. 9.5.1 - updated patch added to match bumped version - patches and unified diffs supplied by Cheyenne Wills, set im metadata as new proxy maintainer under the proxy-maintainers project, cross tested and reviewed within irc channel of the project, fixes the gentoo bug Gentoo bug: #500698 Package-Manager: portage-2.2.26 dev-lang/icon/Manifest | 1 + dev-lang/icon/files/icon-9.5.1-flags.patch | 75 + dev-lang/icon/icon-9.5.1.ebuild| 103 + dev-lang/icon/metadata.xml | 9 +++ 4 files changed, 188 insertions(+) diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest index 178e7a8..b56b03e 100644 --- a/dev-lang/icon/Manifest +++ b/dev-lang/icon/Manifest @@ -1,2 +1,3 @@ DIST icon-v950src.tgz 3115766 SHA256 ceb558bcf5b2edc3252b2d1d4ed640d2a218196f73d299b052f1e0c50e9b1557 SHA512 32f01ca65863525d92846b505ea61f6fbad5a11991d0476c5e79647459dee12746b4448f8d32f2766c198b6713587e48eb0f7f2a942ce42a929f080a85039fa3 WHIRLPOOL 641db3d8d6cc384772649cd0a80884ea9bbb7027df772b19ea6216f164bc589ffc1331cc80447483455e05f54405ed18af0ce69d9d48d4ea7d42ff1b341811c0 +DIST icon-v951src.tgz 3133040 SHA256 062a680862b1c10c21789c0c7c7687c970a720186918d5ed1f7aad9fdc6fa9b9 SHA512 032dc9cfa57af5af2eb84b2116d0537124b5efb87b7cf744ecace2ccf49e461d5be5f91df99d85e8a988520d144fe4ecf06a6e78f7fff997b78afa95355449ad WHIRLPOOL b79ba827a94b71982ad6df4eb1d3218fc4b44bd7331e611616da3544202ed1bd5ea607a6934496b3267b24bf9096cacbf303f4ab949a06e44a43dd8c81e55704 DIST icon.v943src.tgz 3218627 SHA256 d6b6dc508922251748c4ceefbc3a96b54a9f488e260f9f517b5e08dc21615bff SHA512 9f89c7f1aaea1caea586aeb1ef74346a0f258c26ae74581a9ce7b59c2b590eb79316bdb9530b70d9af59ad06e6c444eec92016d0e5b015f4d467bde0baac2695 WHIRLPOOL e776f088ed6a4db10f9defc11a71187cdef4c6ca50b89f80c035b2981c650999cc27bebeab57b99b495653d42af2e34ea5827d6744d4b8f265c7d1883e864437 diff --git a/dev-lang/icon/files/icon-9.5.1-flags.patch b/dev-lang/icon/files/icon-9.5.1-flags.patch new file mode 100644 index 000..ff659b2 --- /dev/null +++ b/dev-lang/icon/files/icon-9.5.1-flags.patch @@ -0,0 +1,75 @@ +--- 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/icon-9.5.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/
commit: 16184ab067ee2ea6769dcd5e4f67cab3166f159e Author: Patrice Clement gentoo org> AuthorDate: Wed Jan 27 08:29:24 2016 + Commit: Patrice Clement gentoo org> CommitDate: Wed Jan 27 08:29:50 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16184ab0 dev-lang/icon: EAPI 5 bump. Package-Manager: portage-2.2.26 Signed-off-by: Patrice Clement gentoo.org> dev-lang/icon/icon-9.5.0-r1.ebuild | 105 + 1 file changed, 105 insertions(+) diff --git a/dev-lang/icon/icon-9.5.0-r1.ebuild b/dev-lang/icon/icon-9.5.0-r1.ebuild new file mode 100644 index 000..22b119e --- /dev/null +++ b/dev-lang/icon/icon-9.5.0-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils flag-o-matic multilib toolchain-funcs + +MY_PV=${PV//./} +SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon-v${MY_PV}src.tgz; +HOMEPAGE="http://www.cs.arizona.edu/icon/; +DESCRIPTION="very high level language" + +LICENSE="public-domain HPND" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="X iplsrc" + +S="${WORKDIR}/icon-v${MY_PV}src" + +DEPEND="X? ( x11-proto/xextproto + x11-proto/xproto + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXt ) + || ( sys-devel/gcc sys-devel/gcc-apple )" + +PATCHES=( + "${FILESDIR}"/${P}-flags.patch +) + +src_prepare() { + epatch "${PATCHES[@]}" + + # do not prestrip files + find "${S}"/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 + + if use X; then + emake X-Configure name=${mytarget} -j1 || die + else + emake Configure name=${mytarget} -j1 || die + fi + + # 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() { + emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_test() { + make Samples || die "Samples failed" + make Test || die "Test failed" +} + +src_install() { + dodir /usr + dodir /usr/bin + dodir /usr/$(get_libdir) + + make Install dest="${ED}/usr/$(get_libdir)/icon" || die "Make install failed" + dosym /usr/$(get_libdir)/icon/bin/icont /usr/bin/icont + dosym /usr/$(get_libdir)/icon/bin/iconx /usr/bin/iconx + dosym /usr/$(get_libdir)/icon/bin/icon /usr/bin/icon + dosym /usr/$(get_libdir)/icon/bin/vib /usr/bin/vib + + cd "${S}/man/man1" || die + doman "${PN}"t.1 + doman "${PN}".1 + rm -rf "${ED}"/usr/$(get_libdir)/${PN}/man || die + + cd "${S}/doc" || die + dodoc *.txt *.sed ../README + # dohtml ignores all anything except .html files, no use here + mkdir -p "${ED}"/usr/share/doc/${PF}/html + cp -dpR *.htm *.gif *.jpg *.css "${ED}"/usr/share/doc/${PF}/html || die + rm -rf "${ED}"/usr/$(get_libdir)/icon/{doc,README} || die + + # optional Icon Programming Library + if use iplsrc; then + cd "${S}" || die + dodir /usr/$(get_libdir)/icon/ipl + rm -fv ipl/{BuildBin,BuildExe,CheckAll,Makefile} || die + insinto /usr/$(get_libdir)/icon + doins -r ipl + fi +}