gentoo resync : 15.12.2019

4 files changed, 123 insertions, 3 deletions

diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 95cc1ea3e7b5..8183deb8ea47 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -1,8 +1,10 @@
 AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca055c02f6ff2d807dc36fb15c15e67c2aa5d3ac4ae11288e710e6e0e4830dced12a0817e395fcc2331547228eb8 SHA512 6f3a68b75fae6693ddbb47b88f8ede4a6994daa4476b3ca472b3ec62db26e36785e3bb7fe7375a9e78ffd0761a4d82351f5d02c30f8ddd55fa5648257526e98f
 AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313
 AUX newt-0.52.15-makefile.patch 403 BLAKE2B a7d85c4d99961894b21d051bb143059c6efbcd29fcf187de1e37344850d545ad98b974346483f2f1aadf1ab029d9d9a0fd64416e6892188cbd2bcfb60a64bc05 SHA512 146430581aa1811ac2f5aa03f6da6f193afda153eb3c3efd8576631f591f3671f05d9479182f593faedc79be17fc91852641259df93faa1231d3eda5e9dfd73d
+AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
 EBUILD newt-0.52.20.ebuild 2012 BLAKE2B fdfa42cba47f46dfde39eff8f47083438b358fc9b37bfc7dffd72307418b8610ef7b00e981a5be495197706b6310e469612ed9c96415103c6deb3f7e06400344 SHA512 69b3ecdba8e9f64bf0aab827f4a63d60b599cc800f64050375c809026d8d3e40f32fbd878f8da713326b746e974a8d4a191c460ba5637c3ea96d371e767abf42
-EBUILD newt-0.52.21.ebuild 1979 BLAKE2B e32d200f5224f084d3961aa71c7193d75802fd335b3515b287217a54ecf0f469dc9701d376fae107394b93fb20b067960e076d979b7d75cbc52faf9310d72b4c SHA512 6a52360a46defb9388f928dc0f4ba7335eb803bb8f2e1e57feac415473ec7cf9d9e6f9acac9cf5214a2545f96d26cb6908aacbede50d653ecc004f619d0356dc
+EBUILD newt-0.52.21-r1.ebuild 2246 BLAKE2B 51502c4f84dbd7aee54fa55a96c1ebe615e6e18e053ef23267d5121bc40a4763fe595de39caf5a046cb1fe666a144b55916296c9aa4e6aff7a4031cad1e90bb9 SHA512 2f5c90bb90d4fe1711f04005101224c9ac8936097b86389b3e31bce4d3cae3570492b5e8cafd3c3a0c75baeaa42b294a23aef770cef6106b1a516e6c613d4389
+EBUILD newt-0.52.21.ebuild 1968 BLAKE2B f09fa26936070237a972abef0cf2da4752a9bda24d3918a23ea91f7fa43bd10950ee8acac48ce9ccc097fe0aed965ef82571a382ba49c4098b5816c808229533 SHA512 8bf8de94b631a99279042692b2efc08ef0e2f34dff4c242ad63f21cbc1e64b06e00c10b3d8cc5f17c3cc5a9cebf4e609834e5adf40c2b175db20e9a6582ab284
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
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
+}
diff --git a/dev-libs/newt/newt-0.52.21.ebuild b/dev-libs/newt/newt-0.52.21.ebuild
index 34e47df4a1ab..15d258b1bf05 100644
--- a/dev-libs/newt/newt-0.52.21.ebuild
+++ b/dev-libs/newt/newt-0.52.21.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-r1 multilib autotools toolchain-funcs
 
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gpm nls tcl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"