[gentoo-commits] repo/gentoo:master commit in: dev-lang/icon/

[Sam James]

commit:     0050f8dfda95f7da8f70a46b1ac3218d1e3daef5
Author:     Cheyenne Wills <cwills <AT> witznd <DOT> net>
AuthorDate: Thu Aug  6 05:07:17 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 00:46:27 2020 +0000
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 <cwills <AT> witznd.net>
Closes: https://github.com/gentoo/gentoo/pull/17026
Signed-off-by: Sam James <sam <AT> 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 00000000000..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 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
+}