diff options
author | David Seifert <soap@gentoo.org> | 2019-12-14 14:03:15 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2019-12-14 14:03:15 +0100 |
commit | 642f9f19fac3771ff46a7eddbc540d4381a7564c (patch) | |
tree | 16140788e63f691ffab7c52d2828d7979101e72e /dev-libs/newt | |
parent | media-libs/suil-0.10.6: bump (diff) | |
download | gentoo-642f9f19fac3771ff46a7eddbc540d4381a7564c.tar.gz gentoo-642f9f19fac3771ff46a7eddbc540d4381a7564c.tar.bz2 gentoo-642f9f19fac3771ff46a7eddbc540d4381a7564c.zip |
dev-libs/newt: Add py3.7 and 3.8
* Use the python sitedir, not just $(libdir), as the python
sitedir is not guaranteed to be nested in $(libdir).
Closes: https://bugs.gentoo.org/702436
Closes: https://github.com/gentoo/gentoo/pull/13980
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-libs/newt')
-rw-r--r-- | dev-libs/newt/files/newt-0.52.21-python-sitedir.patch | 18 | ||||
-rw-r--r-- | dev-libs/newt/newt-0.52.21-r1.ebuild | 100 |
2 files changed, 118 insertions, 0 deletions
diff --git a/dev-libs/newt/files/newt-0.52.21-python-sitedir.patch b/dev-libs/newt/files/newt-0.52.21-python-sitedir.patch new file mode 100644 index 000000000000..6b535b683cd4 --- /dev/null +++ b/dev-libs/newt/files/newt-0.52.21-python-sitedir.patch @@ -0,0 +1,18 @@ +It is not specified whether the python sitedir is located within the native +ABI's $libdir folder. This breaks Gentoo's py3.7 and 3.8 installations. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -154,9 +154,9 @@ + ln -sf $(LIBNEWTSH) $(DESTDIR)/$(libdir)/$(LIBNEWTSONAME) + [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.$(SOEXT) $(DESTDIR)/$(libdir) || : + [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \ +- [ -d $(DESTDIR)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(DESTDIR)/$(libdir)/$$ver/site-packages ;\ +- install -m 755 $$ver/_snack.$(SOEXT) $(DESTDIR)/$(libdir)/$$ver/site-packages ;\ +- install -m 644 snack.py $(DESTDIR)/$(libdir)/$$ver/site-packages ;\ ++ [ -d $(DESTDIR)/$(PYTHON_SITEDIR) ] || install -m 755 -d $(DESTDIR)/$(PYTHON_SITEDIR) ;\ ++ install -m 755 $$ver/_snack.$(SOEXT) $(DESTDIR)/$(PYTHON_SITEDIR) ;\ ++ install -m 644 snack.py $(DESTDIR)/$(PYTHON_SITEDIR) ;\ + done || : + + Makefile: configure.ac diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild new file mode 100644 index 000000000000..a7c6a11c04da --- /dev/null +++ b/dev-libs/newt/newt-0.52.21-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} ) + +inherit autotools python-r1 toolchain-funcs + +DESCRIPTION="Redhat's Newt windowing toolkit development files" +HOMEPAGE="https://pagure.io/newt" +SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="gpm nls tcl" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-libs/popt-1.6 + =sys-libs/slang-2* + elibc_uclibc? ( sys-libs/ncurses:0= ) + gpm? ( sys-libs/gpm ) + tcl? ( >=dev-lang/tcl-8.5:0 ) + " +DEPEND="${RDEPEND}" + +src_prepare() { + # bug 73850 + if use elibc_uclibc; then + sed -i -e 's:-lslang:-lslang -lncurses:g' Makefile.in || die + fi + + sed -i Makefile.in \ + -e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \ + -e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \ + -e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \ + -e 's|instroot|DESTDIR|g' \ + -e 's| make | $(MAKE) |g' \ + -e "s| ar | $(tc-getAR) |g" \ + || die "sed Makefile.in" + + if [[ -n ${LINGUAS} ]]; then + local lang langs + for lang in ${LINGUAS}; do + test -r po/${lang}.po && langs="${langs} ${lang}.po" + done + sed -i po/Makefile \ + -e "/^CATALOGS = /cCATALOGS = ${langs}" \ + || die "sed po/Makefile" + fi + + eapply \ + "${FILESDIR}"/${PN}-0.52.13-gold.patch \ + "${FILESDIR}"/${PN}-0.52.14-tcl.patch \ + "${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch + eapply_user + eautoreconf + + # can't build out-of-source + python_copy_sources +} + +src_configure() { + configuring() { + econf \ + PYTHONVERS="${PYTHON}" \ + $(use_with gpm gpm-support) \ + $(use_with tcl) \ + $(use_enable nls) + } + python_foreach_impl run_in_build_dir configuring +} + +src_compile() { + building() { + emake PYTHONVERS="${EPYTHON}" + } + python_foreach_impl run_in_build_dir building +} + +src_install() { + installit() { + python_export PYTHON_SITEDIR + emake \ + DESTDIR="${D}" \ + PYTHONVERS="${EPYTHON}" \ + install + python_optimize + } + python_foreach_impl run_in_build_dir installit + dodoc peanuts.py popcorn.py tutorial.sgml + doman whiptail.1 + einstalldocs + + # don't want static archives + rm "${ED}"/usr/$(get_libdir)/libnewt.a || die +} |