* [gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/files/, dev-lang/icon/
@ 2016-02-17 7:10 Ian Delaney
0 siblings, 0 replies; 5+ messages in thread
From: Ian Delaney @ 2016-02-17 7:10 UTC (permalink / raw
To: gentoo-commits
commit: c6ef21d44cb2201032e592b289c1cfa0d18a0197
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 07:09:32 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 07:09:55 2016 +0000
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 0000000..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 b/dev-lang/icon/icon-9.5.1.ebuild
new file mode 100644
index 0000000..5c2d138
--- /dev/null
+++ b/dev-lang/icon/icon-9.5.1.ebuild
@@ -0,0 +1,103 @@
+# 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
+}
diff --git a/dev-lang/icon/metadata.xml b/dev-lang/icon/metadata.xml
index e659cbb..4b1d2db 100644
--- a/dev-lang/icon/metadata.xml
+++ b/dev-lang/icon/metadata.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Gentoo Proxy Maintainers Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>cwills@witznd.net</email>
+ <name> Cheyenne Wills</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
<use><flag name="iplsrc">install the icon programming library source</flag></use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/files/, dev-lang/icon/
@ 2018-05-20 17:35 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2018-05-20 17:35 UTC (permalink / raw
To: gentoo-commits
commit: d060d5ce277e89ba856638a2bcd2c12a7d92a54e
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 17:34:22 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 20 17:35:03 2018 +0000
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..00000000000
--- 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..00000000000
--- 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 mklib.sh $(FUNCLIB) $(FUNCS)
- $(FUNCS): icall.h
-
---- icon-v950src/ipl/cfuncs/mklib.sh
-+++ icon-v950src/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-v950src/ipl/packs/loadfunc/Makefile
-+++ icon-v950src/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-v950src/src/common/Makefile
-+++ icon-v950src/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-v950src/src/rtt/Makefile
-+++ icon-v950src/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-v950src/src/runtime/Makefile
-+++ icon-v950src/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/tests-943.patch b/dev-lang/icon/files/tests-943.patch
deleted file mode 100644
index 75108cab193..00000000000
--- a/dev-lang/icon/files/tests-943.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -uprN icon.v943src_base/tests/general/io.icn icon.v943src/tests/general/io.icn
---- icon.v943src_base/tests/general/io.icn 2002-03-11 14:21:18.000000000 -0700
-+++ icon.v943src/tests/general/io.icn 2006-04-01 10:35:14.590948251 -0700
-@@ -6,7 +6,7 @@ procedure main()
- local L, f, m, n, t1, t2
-
- L := [&input, &output, &errout,
-- m := open("/etc/motd") | stop("no /etc/motd"),
-+ m := open("/etc/gentoo-release") | stop("no /etc/gentoo-release"),
- n := open("/dev/null", "w") | stop("no /dev/null")]
- L := sort(L)
- every f := !L do
-@@ -21,10 +21,10 @@ procedure main()
- every write(!&input) \ 2
-
- write()
-- write("flush /etc/motd: ", image(flush(m)) | "FAILED")
-- write("close /etc/motd: ", image(close(m)) | "FAILED")
-- write("close /etc/motd: ", image(close(m)) | "FAILED")
-- write("flush /etc/motd: ", image(flush(m)) | "FAILED")
-+ write("flush /etc/gentoo-release: ", image(flush(m)) | "FAILED")
-+ write("close /etc/gentoo-release: ", image(close(m)) | "FAILED")
-+ write("close /etc/gentoo-release: ", image(close(m)) | "FAILED")
-+ write("flush /etc/gentoo-release: ", image(flush(m)) | "FAILED")
-
- write()
- write("flush /dev/null: ", image(flush(n)) | "FAILED")
-diff -uprN icon.v943src_base/tests/general/io.std icon.v943src/tests/general/io.std
---- icon.v943src_base/tests/general/io.std 2002-03-11 14:21:18.000000000 -0700
-+++ icon.v943src/tests/general/io.std 2006-04-01 10:35:31.071362086 -0700
-@@ -2,7 +2,7 @@ file: &errout
- file: &input
- file: &output
- file: file(/dev/null)
--file: file(/etc/motd)
-+file: file(/etc/gentoo-release)
-
- aaa
- bbbb
-@@ -13,10 +13,10 @@ ffffffff
- ggggggggg
- hhhhhhhhhh
-
--flush /etc/motd: file(/etc/motd)
--close /etc/motd: file(/etc/motd)
--close /etc/motd: file(/etc/motd)
--flush /etc/motd: file(/etc/motd)
-+flush /etc/gentoo-release: file(/etc/gentoo-release)
-+close /etc/gentoo-release: file(/etc/gentoo-release)
-+close /etc/gentoo-release: file(/etc/gentoo-release)
-+flush /etc/gentoo-release: file(/etc/gentoo-release)
-
- flush /dev/null: file(/dev/null)
- close /dev/null: file(/dev/null)
-@@ -109,7 +109,7 @@ file(sed 's/^/=()= /' io.icn)
- > =()= local L, f, m, n, t1, t2
- > =()=
- > =()= L := [&input, &output, &errout,
--> =()= m := open("/etc/motd") | stop("no /etc/motd"),
-+> =()= m := open("/etc/gentoo-release") | stop("no /etc/gentoo-release"),
- > =()= n := open("/dev/null", "w") | stop("no /dev/null")]
-
- file(ls io.i?n io.d?t io.s?d)
-diff -uprN icon.v943src_base/tests/general/kwds.std icon.v943src/tests/general/kwds.std
---- icon.v943src_base/tests/general/kwds.std 2002-07-10 18:29:28.000000000 -0600
-+++ icon.v943src/tests/general/kwds.std 2006-04-01 10:35:37.103317654 -0700
-@@ -20,8 +20,10 @@
- &features: ASCII
- &features: co-expressions
- &features: environment variables
-+ &features: event monitoring
- &features: keyboard functions
- &features: large integers
-+ &features: multiple programs
- &features: pipes
- &features: system function
- &input: &input
-diff -uprN icon.v943src_base/tests/general/nargs.std icon.v943src/tests/general/nargs.std
---- icon.v943src_base/tests/general/nargs.std 2001-12-06 15:54:01.000000000 -0700
-+++ icon.v943src/tests/general/nargs.std 2006-04-01 10:35:43.282223496 -0700
-@@ -15,7 +15,7 @@
- 1 delay
- 2 delete
- -2 detab
-- 2 display
-+ 3 display
- 1 dtor
- -2 entab
- 0 errorclear
-@@ -43,12 +43,12 @@
- 4 match
- 2 member
- 1 move
-- 1 name
-+ 2 name
- 1 numeric
- 1 ord
- 1 pop
- 1 pos
-- 2 proc
-+ 3 proc
- 1 pull
- -2 push
- -2 put
-@@ -79,7 +79,7 @@
- 2 trim
- 1 type
- 4 upto
-- 1 variable
-+ 3 variable
- 1 where
- -1 write
- -1 writes
diff --git a/dev-lang/icon/icon-9.4.3-r5.ebuild b/dev-lang/icon/icon-9.4.3-r5.ebuild
deleted file mode 100644
index 6397d8f311e..00000000000
--- a/dev-lang/icon/icon-9.4.3-r5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-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 sparc x86"
-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"
-
-src_unpack() {
- unpack ${A}
-
- epatch "${FILESDIR}"/${P}-flags.patch
-
- # Patch the tests so that they do not fail
- # The following files in tests/standard are patched..
- # io.icn - change /etc/motd to /etc/gentoo-release
- # io.std - change /etc/motd to /etc/gentoo-release
- # kwds.std - add two lines for the two new added keywords
- # nargs.std - a couple of functions picked up additional parameters
- epatch "${FILESDIR}/tests-${MY_PV}.patch"
-
- # do not prestrip files
- find "${S}"/src -name 'Makefile' | xargs sed -i -e "/strip/d" || die
-}
-
-src_compile() {
- # 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
-
- echo "#define MultiThread 1" >> src/h/define.h
- echo "#define EventMon 1" >> src/h/define.h
- echo "#define Eve 1" >> src/h/define.h
-
- append-flags $(test-flags -fno-strict-aliasing -fwrapv)
-
- emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "Make Failed"
-}
-
-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="${D}/usr/$(get_libdir)/icon" || die "Make install failed"
- 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
- doman icon.1
- rm -rf "${D}"/usr/$(get_libdir)/icon/man
-
- cd "${S}/doc"
- dodoc *.txt *.sed ../README
- # dohtml ignores all anything except .html files, no use here
- mkdir -p "${D}"/usr/share/doc/${PF}/html
- cp -dpR *.htm *.gif *.jpg *.css "${D}"/usr/share/doc/${PF}/html
- rm -rf "${D}"/usr/$(get_libdir)/icon/{doc,README}
-
- # optional Icon Programming Library
- if use iplsrc; then
- cd "${S}"
- dodir /usr/$(get_libdir)/icon/ipl
- rm ipl/BuildBin
- rm ipl/BuildExe
- rm ipl/CheckAll
- rm ipl/Makefile
- insinto /usr/$(get_libdir)/icon
- doins -r ipl
- fi
-}
diff --git a/dev-lang/icon/icon-9.5.0-r1.ebuild b/dev-lang/icon/icon-9.5.0-r1.ebuild
deleted file mode 100644
index efe23034471..00000000000
--- a/dev-lang/icon/icon-9.5.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ../$(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
- 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
-}
diff --git a/dev-lang/icon/icon-9.5.0.ebuild b/dev-lang/icon/icon-9.5.0.ebuild
deleted file mode 100644
index 9fdaf86bac8..00000000000
--- a/dev-lang/icon/icon-9.5.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-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 )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-flags.patch
-
- # 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 ../$(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
- doman icon.1
- rm -rf "${ED}"/usr/$(get_libdir)/icon/man
-
- cd "${S}/doc"
- 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
- rm -rf "${ED}"/usr/$(get_libdir)/icon/{doc,README}
-
- # optional Icon Programming Library
- if use iplsrc; then
- cd "${S}"
- dodir /usr/$(get_libdir)/icon/ipl
- rm ipl/BuildBin
- rm ipl/BuildExe
- rm ipl/CheckAll
- rm ipl/Makefile
- insinto /usr/$(get_libdir)/icon
- doins -r ipl
- fi
-}
diff --git a/dev-lang/icon/icon-9.5.1.ebuild b/dev-lang/icon/icon-9.5.1.ebuild
deleted file mode 100644
index 1f8a07a1b37..00000000000
--- a/dev-lang/icon/icon-9.5.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ../$(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
- 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/files/, dev-lang/icon/
@ 2018-12-02 20:35 Georgy Yakovlev
0 siblings, 0 replies; 5+ messages in thread
From: Georgy Yakovlev @ 2018-12-02 20:35 UTC (permalink / raw
To: gentoo-commits
commit: e6208724793683c9c07dd2741483d39797dca1a2
Author: Cheyenne Wills <cwills <AT> witznd <DOT> net>
AuthorDate: Mon Oct 29 01:10:29 2018 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 20:32:47 2018 +0000
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 <cwills <AT> witznd.net>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> 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 00000000000..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 00000000000..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 "${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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/files/, dev-lang/icon/
@ 2020-06-04 13:35 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2020-06-04 13:35 UTC (permalink / raw
To: gentoo-commits
commit: ee19109f17c12e97eea26c8506538eb246de32ee
Author: Cheyenne Wills <cwills <AT> witznd <DOT> net>
AuthorDate: Mon May 18 04:48:10 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 4 13:34:37 2020 +0000
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 <cwills <AT> witznd.net>
Signed-off-by: Joonas Niilola <juippis <AT> 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 00000000000..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 <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-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)
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/files/, dev-lang/icon/
@ 2021-10-08 11:55 Ionen Wolkens
0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2021-10-08 11:55 UTC (permalink / raw
To: gentoo-commits
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>proxy-maint@gentoo.org</email>
<name>Gentoo Proxy Maintainers Project</name>
</maintainer>
- <use>
- <flag name="iplsrc">install the icon programming library source</flag>
- </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-10-08 11:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-02 20:35 [gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/files/, dev-lang/icon/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2021-10-08 11:55 Ionen Wolkens
2020-06-04 13:35 Joonas Niilola
2018-05-20 17:35 Matt Turner
2016-02-17 7:10 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox