* [gentoo-commits] repo/gentoo:master commit in: net-misc/suite3270/, net-misc/suite3270/files/
@ 2017-12-31 21:49 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2017-12-31 21:49 UTC (permalink / raw
To: gentoo-commits
commit: b23fd149a54353ddf4c26afa53be556c6c8acc7b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 10:22:08 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 21:48:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23fd149
net-misc/suite3270: Clean old up
net-misc/suite3270/Manifest | 4 -
net-misc/suite3270/files/Makefile.in | 10 ---
net-misc/suite3270/suite3270-3.3.15_p9.ebuild | 117 --------------------------
net-misc/suite3270/suite3270-3.4_p9.ebuild | 101 ----------------------
net-misc/suite3270/suite3270-3.5_p8.ebuild | 103 -----------------------
net-misc/suite3270/suite3270-3.5_p9.ebuild | 103 -----------------------
6 files changed, 438 deletions(-)
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index 61b190ec8b1..9a4f08d803b 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,6 +1,2 @@
-DIST suite3270-3.3.15ga9-src.tgz 6960911 BLAKE2B feecbe65c24767ba0854de45ace1b2ac76df0c9f9c433d1f9e84808ef2eb2ac073d4fa879c8c87fb17c9a0ec77de00f48e01c52f2f45675ba14a54042fa1639d SHA512 dd6ad0b42f935a9a25170d3ef765e8d31746b7c6a7d9c6f31630da77cc4fd2bde9f4861c86fb237211dd17e60423c4e1627871c8a710467076b99166e7774ccb
DIST suite3270-3.4ga10-src.tgz 3398730 BLAKE2B 4adc02b416d5fbf2facbf4e42c58a2bd3ed551ce46494ece039ef129663957632316882d5a5b28e272fa47010105a3682618b8ac2d355e745c576af74d0bb310 SHA512 d9ed4aa41c45a2e961d5c2d0c00c6b81526da64b9c1765b0c5e39cb647157026a787db2054b2feb55c57e5a458a31062141471447b1177fd46cbbeb7d71e3f28
-DIST suite3270-3.4ga9-src.tgz 3400841 BLAKE2B 04b32519c9a82b28599925c6c470f9f6c2cf37a0e6c652ae1e0be8ab61f4a2d299b0cdae86e8036e491bc9a1d924a497756b38a245b20d6974da4be0e9679c49 SHA512 02c834d8a23bf3cde33dec017d5d8dcc6473ca43bb066d3d0315898de9a2685ad75986ec14e2c6234269b310121bb5f8c4a04df3694e02fcc6c0947cfc661f69
DIST suite3270-3.5ga10-src.tgz 3412329 BLAKE2B c9ed308cf970da150da985d76ec377c83a03041eddfcbad9baa7211776a7b68292109cccb2ec250952edb77eeca79143137eb8a94da8b774e952c3e5790c6231 SHA512 0cce1212ca7589595cd2f775d18086f231a9e6d621716be5a41123a379358d9ac08c9668de2bd6a2e401ae54d12a4905c3c260cb7ba90482bbce6790d8e3efb8
-DIST suite3270-3.5ga8-src.tgz 3404504 BLAKE2B 6a2d8eced43164eaa6af1750fc8ea0a00a20dad53f720e2d783209691896dd36d8104fb4cf7c3adab203be1ccdb2beb098328b15cb59b845ae87deb59c836cf2 SHA512 f912afccaec7a489fcfb4e6d61729154c09a68df9478747d7b074d970fbe4b7ac8c809fb496b1cd329d6119a2dc45b2d67ef94f39679218858afc75a4a3dc072
-DIST suite3270-3.5ga9-src.tgz 3409168 BLAKE2B dcc1350c4901dcfe39cbea311336199e3ffcae91ecd50cca82d4d3fa6000881c678aa9491962609ca2816c8f30300fc1e5ad4bd0e7c1410c4270cb5370314aee SHA512 b206f0f9a698922ca207d93cbd9d302c2fc9fd7f492de78f63fadaaee96dfeeebe3e06a51ca181f5785287832db7e1a3b6666db2cab1a23a138caab7e1eed634
diff --git a/net-misc/suite3270/files/Makefile.in b/net-misc/suite3270/files/Makefile.in
deleted file mode 100644
index 154b470de80..00000000000
--- a/net-misc/suite3270/files/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT STARE AT THE SUN
-VER = @VER@
-_SUBDIRS = @SUBDIRS@
-SUBDIRS = $(_SUBDIRS:=-$(VER))
-all:
-%:; $(MAKE) `printf '%s_$@_ ' $(SUBDIRS)`
-_words = $(subst _, ,$1)
-_dir = $(firstword $(call _words,$@))
-_targ = $(lastword $(call _words,$@))
-%_:; $(MAKE) -C $(_dir) $(_targ) $(EXTRA_TARGETS)
diff --git a/net-misc/suite3270/suite3270-3.3.15_p9.ebuild b/net-misc/suite3270/suite3270-3.3.15_p9.ebuild
deleted file mode 100644
index c9907aa4518..00000000000
--- a/net-misc/suite3270/suite3270-3.3.15_p9.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-MY_PV=${PV/_p/ga}
-MY_P=${PN}-${MY_PV}
-SUB_PV=${PV:0:3}
-
-S=${WORKDIR}
-
-# only the x3270 package installs fonts
-FONT_PN="x3270"
-FONT_S=${WORKDIR}/${FONT_PN}-${SUB_PV}
-
-inherit eutils font multiprocessing
-
-DESCRIPTION="Complete 3270 access package"
-HOMEPAGE="http://x3270.bgp.nu/"
-SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc s390 sparc x86"
-IUSE="cjk doc ncurses ssl tcl X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
- X? (
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXt
- )
- ncurses? ( sys-libs/ncurses sys-libs/readline )
- tcl? ( dev-lang/tcl:0 )"
-DEPEND="${RDEPEND}
- X? (
- x11-misc/xbitmaps
- x11-proto/xproto
- app-text/rman
- x11-apps/mkfontdir
- x11-apps/bdftopcf
- )"
-
-suite3270_makelist() {
- echo pr3287 s3270 \
- $(usex ncurses c3270 '') \
- $(usex tcl tcl3270 '') \
- $(usex X x3270 '')
-}
-
-src_prepare() {
- # Some subdirs (like c3270/x3270/s3270) install the same set of data files
- # (they have the same contents). Wrap that in a retry to avoid errors.
- cat <<-EOF > _install
- #!/bin/sh
- for n in {1..5}; do
- install "\$@" && exit
- echo "retrying ..."
- done
- EOF
- chmod a+rx _install
- sed -i \
- -e "s:@INSTALL@:${S}/_install:" \
- */Makefile.in
-
- sed -i \
- -e 's:CPPFunction:rl_completion_func_t:' \
- c3270-*/c3270.c || die #503364
-}
-
-src_configure() {
- local p myconf
- # Run configures in parallel!
- multijob_init
- for p in $(suite3270_makelist) ; do
- cd "${S}/${p}-${SUB_PV}"
- if [[ ${p} == "x3270" ]] ; then
- myconf=(
- --without-xmkmf
- $(use_with X x)
- $(use_with X fontdir "${FONTDIR}")
- )
- else
- myconf=()
- fi
- multijob_child_init econf \
- --cache-file="${S}"/config.cache \
- $(use_enable cjk dbcs) \
- $(use_enable ssl) \
- "${myconf[@]}"
- done
- sed \
- -e "s:@SUBDIRS@:$(suite3270_makelist):" \
- -e "s:@VER@:${SUB_PV}:" \
- "${FILESDIR}"/Makefile.in > "${S}"/Makefile || die
- multijob_finish
-}
-
-src_install() {
- use X && dodir "${FONTDIR}"
- EXTRA_TARGETS='install.man' default
- local p
- for p in $(suite3270_makelist) ; do
- cd "${S}/${p}-${SUB_PV}"
- docinto ${p}
- local d=$(echo README*)
- [[ -n ${d} ]] && dodoc ${d}
- use doc && dohtml html/*
- done
- find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} +
-
- use X && font_src_install
-}
-
-pkg_postinst() { use X && font_pkg_postinst ; }
-pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/suite3270/suite3270-3.4_p9.ebuild b/net-misc/suite3270/suite3270-3.4_p9.ebuild
deleted file mode 100644
index d3e53d33da3..00000000000
--- a/net-misc/suite3270/suite3270-3.4_p9.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PV=${PV/_p/ga}
-MY_P=${PN}-${MY_PV}
-SUB_PV=${PV:0:3}
-
-S=${WORKDIR}/${PN}-${SUB_PV}
-
-# only the x3270 package installs fonts
-FONT_PN="x3270"
-FONT_S=${WORKDIR}/${FONT_PN}
-
-inherit eutils font
-
-DESCRIPTION="Complete 3270 access package"
-HOMEPAGE="http://x3270.bgp.nu/"
-SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc s390 sparc x86"
-IUSE="cjk doc ncurses ssl tcl X"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )
- X? (
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXt
- )
- ncurses? (
- sys-libs/ncurses:=
- sys-libs/readline:0=
- )
- tcl? ( dev-lang/tcl:0 )"
-DEPEND="${RDEPEND}
- X? (
- x11-misc/xbitmaps
- x11-proto/xproto
- app-text/rman
- x11-apps/mkfontdir
- x11-apps/bdftopcf
- )"
-
-suite3270_makelist() {
- echo pr3287 s3270 \
- $(usex ncurses c3270 '') \
- $(usex tcl tcl3270 '') \
- $(usex X x3270 '')
-}
-
-src_prepare() {
- # Some subdirs (like c3270/x3270/s3270) install the same set of data files
- # (they have the same contents). Wrap that in a retry to avoid errors.
- cat <<-EOF > _install
- #!/bin/sh
- for n in 1 2 3 4 5; do
- install "\$@" && exit
- echo "retrying ..."
- done
- exit 1
- EOF
- chmod a+rx _install
- # Can't use the $INSTALL var as top level configure also uses it.
- # https://sourceforge.net/p/x3270/bugs/15/
- export ac_cv_path_install="${S}/_install"
-}
-
-src_configure() {
- echo "${INSTALL}"
- econf \
- --cache-file="${S}"/config.cache \
- --enable-s3270 \
- --enable-pr3287 \
- $(use_enable ncurses c3270) \
- $(use_enable tcl tcl3270) \
- $(use_enable X x3270) \
- $(use_with X x) \
- $(use_with X fontdir "${FONTDIR}")
-}
-
-src_install() {
- use X && dodir "${FONTDIR}"
- emake DESTDIR="${D}" install{,.man}
-
- local p
- for p in $(suite3270_makelist) ; do
- cd "${S}/${p}"
- docinto ${p}
- dodoc README*
- use doc && dohtml html/*
- done
-
- use X && font_src_install
-}
-
-pkg_postinst() { use X && font_pkg_postinst ; }
-pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/suite3270/suite3270-3.5_p8.ebuild b/net-misc/suite3270/suite3270-3.5_p8.ebuild
deleted file mode 100644
index 896e6de13dd..00000000000
--- a/net-misc/suite3270/suite3270-3.5_p8.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PV=${PV/_p/ga}
-MY_P=${PN}-${MY_PV}
-SUB_PV=${PV:0:3}
-
-S=${WORKDIR}/${PN}-${SUB_PV}
-
-# only the x3270 package installs fonts
-FONT_PN="x3270"
-FONT_S="${S}/${FONT_PN}"
-
-inherit eutils font
-
-DESCRIPTION="Complete 3270 access package"
-HOMEPAGE="http://x3270.bgp.nu/"
-SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
-IUSE="cjk doc ncurses ssl tcl X"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )
- X? (
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXt
- )
- ncurses? (
- sys-libs/ncurses:=
- sys-libs/readline:0=
- )
- tcl? ( dev-lang/tcl:0 )"
-DEPEND="${RDEPEND}
- X? (
- x11-misc/xbitmaps
- x11-proto/xproto
- app-text/rman
- x11-apps/mkfontdir
- x11-apps/bdftopcf
- )"
-
-suite3270_makelist() {
- echo pr3287 s3270 \
- $(usex ncurses c3270 '') \
- $(usex tcl tcl3270 '') \
- $(usex X x3270 '')
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
-
- # Some subdirs (like c3270/x3270/s3270) install the same set of data files
- # (they have the same contents). Wrap that in a retry to avoid errors.
- cat <<-EOF > _install
- #!/bin/sh
- for n in 1 2 3 4 5; do
- install "\$@" && exit
- echo "retrying ..."
- done
- exit 1
- EOF
- chmod a+rx _install
- # Can't use the $INSTALL var as top level configure also uses it.
- # https://sourceforge.net/p/x3270/bugs/15/
- export ac_cv_path_install="${S}/_install"
-}
-
-src_configure() {
- echo "${INSTALL}"
- econf \
- --cache-file="${S}"/config.cache \
- --enable-s3270 \
- --enable-pr3287 \
- $(use_enable ncurses c3270) \
- $(use_enable tcl tcl3270) \
- $(use_enable X x3270) \
- $(use_with X x) \
- $(use_with X fontdir "${FONTDIR}")
-}
-
-src_install() {
- use X && dodir "${FONTDIR}"
- emake DESTDIR="${D}" install{,.man}
-
- local p
- for p in $(suite3270_makelist) ; do
- cd "${S}/${p}"
- docinto ${p}
- dodoc README*
- use doc && dohtml html/*
- done
-
- use X && font_src_install
-}
-
-pkg_postinst() { use X && font_pkg_postinst ; }
-pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/suite3270/suite3270-3.5_p9.ebuild b/net-misc/suite3270/suite3270-3.5_p9.ebuild
deleted file mode 100644
index 896e6de13dd..00000000000
--- a/net-misc/suite3270/suite3270-3.5_p9.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PV=${PV/_p/ga}
-MY_P=${PN}-${MY_PV}
-SUB_PV=${PV:0:3}
-
-S=${WORKDIR}/${PN}-${SUB_PV}
-
-# only the x3270 package installs fonts
-FONT_PN="x3270"
-FONT_S="${S}/${FONT_PN}"
-
-inherit eutils font
-
-DESCRIPTION="Complete 3270 access package"
-HOMEPAGE="http://x3270.bgp.nu/"
-SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
-IUSE="cjk doc ncurses ssl tcl X"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )
- X? (
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXt
- )
- ncurses? (
- sys-libs/ncurses:=
- sys-libs/readline:0=
- )
- tcl? ( dev-lang/tcl:0 )"
-DEPEND="${RDEPEND}
- X? (
- x11-misc/xbitmaps
- x11-proto/xproto
- app-text/rman
- x11-apps/mkfontdir
- x11-apps/bdftopcf
- )"
-
-suite3270_makelist() {
- echo pr3287 s3270 \
- $(usex ncurses c3270 '') \
- $(usex tcl tcl3270 '') \
- $(usex X x3270 '')
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
-
- # Some subdirs (like c3270/x3270/s3270) install the same set of data files
- # (they have the same contents). Wrap that in a retry to avoid errors.
- cat <<-EOF > _install
- #!/bin/sh
- for n in 1 2 3 4 5; do
- install "\$@" && exit
- echo "retrying ..."
- done
- exit 1
- EOF
- chmod a+rx _install
- # Can't use the $INSTALL var as top level configure also uses it.
- # https://sourceforge.net/p/x3270/bugs/15/
- export ac_cv_path_install="${S}/_install"
-}
-
-src_configure() {
- echo "${INSTALL}"
- econf \
- --cache-file="${S}"/config.cache \
- --enable-s3270 \
- --enable-pr3287 \
- $(use_enable ncurses c3270) \
- $(use_enable tcl tcl3270) \
- $(use_enable X x3270) \
- $(use_with X x) \
- $(use_with X fontdir "${FONTDIR}")
-}
-
-src_install() {
- use X && dodir "${FONTDIR}"
- emake DESTDIR="${D}" install{,.man}
-
- local p
- for p in $(suite3270_makelist) ; do
- cd "${S}/${p}"
- docinto ${p}
- dodoc README*
- use doc && dohtml html/*
- done
-
- use X && font_src_install
-}
-
-pkg_postinst() { use X && font_pkg_postinst ; }
-pkg_postrm() { use X && font_pkg_postrm ; }
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/suite3270/, net-misc/suite3270/files/
@ 2021-02-13 10:27 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2021-02-13 10:27 UTC (permalink / raw
To: gentoo-commits
commit: 91e7d28362d0508ab78963aab7cd4d156901e552
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Feb 13 10:27:10 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 10:27:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e7d283
net-misc/suite3270: Remove old
Bug: https://bugs.gentoo.org/765517
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-misc/suite3270/Manifest | 1 -
.../suite3270/files/suite3270-3.5_p8-tinfo.patch | 87 -----------------
net-misc/suite3270/suite3270-3.6_p8.ebuild | 107 ---------------------
3 files changed, 195 deletions(-)
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index a16fef905a5..5f9a9141c1a 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,2 +1 @@
-DIST suite3270-3.6ga8-src.tgz 3296047 BLAKE2B 98bcee4591c3eea12c7127aa2eeb39613f6f090c041ceab7a7b0f1bf0e946c3048ba2f93eaacf2bbaf04b44ba78a8895f6b7acdcf20baea19a408464f83f4d62 SHA512 88a00bec19ae7be92e5bc0edd6ae1e27bef7fbbf8c3f419efda3ba2b3a0cb5e72693916cd44d50166d5745ce0f9d8497641481cedbb0bb3149567b6f51b1a987
DIST suite3270-4.0ga13-src.tgz 3317494 BLAKE2B 898f279143006e1fc1f470bda3917afe85957de745676dc915f9c94292824ba0e10fc2ccf0a47e307c41e48741a3da7c066c45f63c917295e0522122226b79dd SHA512 bdf9c5d129419c87b45907186e5f158d8623009151357e4d8a3d08ffff2f3729449cead84d005227bfb32968ae363d1a29350692cabe9bf8b71f760eda3f496b
diff --git a/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch b/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch
deleted file mode 100644
index 54be6e0510c..00000000000
--- a/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From a28f70d7fa11907898887706df35c3c3831d901a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 10 May 2016 01:12:30 -0400
-Subject: [PATCH] c3270: autolink libtinfo when it exists
-
-The ncurses libs might split out core funcs into libtinfo. Make sure we
-detect & link this when available otherwise the linker might complain the
-symbols are missing:
-ld: screen.o: undefined reference to symbol 'meta'
-/usr/lib64/libtinfo.so.6: error adding symbols: DSO missing from command line
-collect2: error: ld returned 1 exit status
----
- c3270/configure.in | 1 +
- c3270/configure | 45 +++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 46 insertions(+)
-
-diff --git a/c3270/configure.in b/c3270/configure.in
-index d9f19e6..8c6d852 100644
---- a/c3270/configure.in
-+++ b/c3270/configure.in
-@@ -129,6 +129,7 @@ dnl first, so that objects in them can be used by subsequent libraries.
- AC_SEARCH_LIBS(forkpty, util)
- AC_CHECK_FUNCS(forkpty)
- AC_CHECK_LIB(ncursesw, newterm, , [AC_CHECK_LIB(ncurses, newterm, , [AC_CHECK_LIB(curses, newterm, , [AC_MSG_ERROR(Can't find libncurses or new-enough libcurses)])])])
-+AC_CHECK_LIB(tinfo, meta)
- if test "$with_readline" != no; then
- AC_CHECK_LIB(readline, rl_initialize)
- fi
-diff --git a/c3270/configure b/c3270/configure
-index bef2dff..9946e83 100755
---- a/c3270/configure
-+++ b/c3270/configure
-@@ -4020,6 +4020,51 @@ fi
-
- fi
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for meta in -ltinfo" >&5
-+$as_echo_n "checking for meta in -ltinfo... " >&6; }
-+if ${ac_cv_lib_tinfo_meta+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltinfo $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char meta ();
-+int
-+main ()
-+{
-+return meta ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_tinfo_meta=yes
-+else
-+ ac_cv_lib_tinfo_meta=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_meta" >&5
-+$as_echo "$ac_cv_lib_tinfo_meta" >&6; }
-+if test "x$ac_cv_lib_tinfo_meta" = xyes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBTINFO 1
-+_ACEOF
-+
-+ LIBS="-ltinfo $LIBS"
-+
-+fi
-+
- if test "$with_readline" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_initialize in -lreadline" >&5
- $as_echo_n "checking for rl_initialize in -lreadline... " >&6; }
---
-2.7.4
-
diff --git a/net-misc/suite3270/suite3270-3.6_p8.ebuild b/net-misc/suite3270/suite3270-3.6_p8.ebuild
deleted file mode 100644
index d8c130a1692..00000000000
--- a/net-misc/suite3270/suite3270-3.6_p8.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_PV=${PV/_p/ga}
-MY_P=${PN}-${MY_PV}
-SUB_PV=${PV:0:3}
-
-S=${WORKDIR}/${PN}-${SUB_PV}
-
-# only the x3270 package installs fonts
-FONT_PN="x3270"
-FONT_S="${S}/${FONT_PN}"
-
-inherit eutils font
-
-DESCRIPTION="Complete 3270 access package"
-HOMEPAGE="http://x3270.bgp.nu/"
-SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc s390 sparc x86"
-IUSE="cjk doc ncurses ssl tcl X"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )
- X? (
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXt
- )
- ncurses? (
- sys-libs/ncurses:=
- sys-libs/readline:0=
- )
- tcl? ( dev-lang/tcl:0 )"
-DEPEND="${RDEPEND}
- X? (
- x11-base/xorg-proto
- x11-misc/xbitmaps
- app-text/rman
- >=x11-apps/mkfontscale-1.2.0
- x11-apps/bdftopcf
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
-)
-
-suite3270_makelist() {
- echo pr3287 s3270 \
- $(usex ncurses c3270 '') \
- $(usex tcl tcl3270 '') \
- $(usex X x3270 '')
-}
-
-src_prepare() {
- default
-
- # Some subdirs (like c3270/x3270/s3270) install the same set of data files
- # (they have the same contents). Wrap that in a retry to avoid errors.
- cat <<-EOF > _install
- #!/bin/sh
- for n in 1 2 3 4 5; do
- install "\$@" && exit
- echo "retrying ..."
- done
- exit 1
- EOF
- chmod a+rx _install
- # Can't use the $INSTALL var as top level configure also uses it.
- # https://sourceforge.net/p/x3270/bugs/15/
- export ac_cv_path_install="${S}/_install"
-}
-
-src_configure() {
- echo "${INSTALL}"
- econf \
- --cache-file="${S}"/config.cache \
- --enable-s3270 \
- --enable-pr3287 \
- $(use_enable ncurses c3270) \
- $(use_enable tcl tcl3270) \
- $(use_enable X x3270) \
- $(use_with X x) \
- $(use_with X fontdir "${FONTDIR}")
-}
-
-src_install() {
- use X && dodir "${FONTDIR}"
- emake DESTDIR="${D}" install{,.man}
-
- local p
- for p in $(suite3270_makelist) ; do
- cd "${S}/${p}"
- docinto ${p}
- dodoc README*
- use doc && dohtml html/*
- done
-
- use X && font_src_install
-}
-
-pkg_postinst() { use X && font_pkg_postinst ; }
-pkg_postrm() { use X && font_pkg_postrm ; }
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/suite3270/, net-misc/suite3270/files/
@ 2022-07-30 16:26 Arthur Zamarin
0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2022-07-30 16:26 UTC (permalink / raw
To: gentoo-commits
commit: 4682f355ba2c7615e1b5fe2f80b5bfa3e1bf2896
Author: brahmajit das <listout <AT> protonmail <DOT> com>
AuthorDate: Sat Jul 23 18:38:40 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 16:26:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4682f355
net-misc/suite3270: Fix unknown type name wint_t on musl
While building on musl we get build error 'error: unknown type name
wint_t; did you mean ino_t?'. This patch fixes it.
Closes: https://bugs.gentoo.org/713618
Signed-off-by: brahmajit das <listout <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26545
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/suite3270/files/suite3270-4.1-musl-wint-t-fix.patch | 12 ++++++++++++
net-misc/suite3270/suite3270-4.1_p11.ebuild | 4 ++++
2 files changed, 16 insertions(+)
diff --git a/net-misc/suite3270/files/suite3270-4.1-musl-wint-t-fix.patch b/net-misc/suite3270/files/suite3270-4.1-musl-wint-t-fix.patch
new file mode 100644
index 000000000000..8a3330d24b4b
--- /dev/null
+++ b/net-misc/suite3270/files/suite3270-4.1-musl-wint-t-fix.patch
@@ -0,0 +1,12 @@
+# Fix unknown type name wint_t when building against musl
+# Closes: https://bugs.gentoo.org/713618
+--- a/c3270/screen.c
++++ b/c3270/screen.c
+@@ -63,6 +63,7 @@
+ #include "utils.h"
+ #include "xio.h"
+ #include "xscroll.h"
++#include "wctype.h"
+
+ #include "cscreen.h"
+
diff --git a/net-misc/suite3270/suite3270-4.1_p11.ebuild b/net-misc/suite3270/suite3270-4.1_p11.ebuild
index ff116d07cfcf..ed1340f214dc 100644
--- a/net-misc/suite3270/suite3270-4.1_p11.ebuild
+++ b/net-misc/suite3270/suite3270-4.1_p11.ebuild
@@ -64,6 +64,10 @@ src_prepare() {
export ac_cv_path_install="${S}/_install"
}
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.1-musl-wint-t-fix.patch
+)
+
src_configure() {
econf \
--cache-file="${S}"/config.cache \
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-30 16:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-30 16:26 [gentoo-commits] repo/gentoo:master commit in: net-misc/suite3270/, net-misc/suite3270/files/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2021-02-13 10:27 David Seifert
2017-12-31 21:49 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox