gentoo resync : 29.08.2018

4 files changed, 48 insertions, 15 deletions

diff --git a/x11-libs/libyui-ncurses/Manifest b/x11-libs/libyui-ncurses/Manifest
index 37f42a3d1be2..64ed8909b822 100644
--- a/x11-libs/libyui-ncurses/Manifest
+++ b/x11-libs/libyui-ncurses/Manifest
@@ -1,4 +1,5 @@
-AUX libyui-ncurses-2.46.4-tinfo.patch 934 BLAKE2B 346d2f87a532c7aa5f460743371d59e2f4d751cf27fa1e5d8f4c6fe4a177afa2c5c0b90ff5665eb59c90620039c3b673f8cde37c6e8ebc497282a7939c1017bc SHA512 cdfad23f199dc4c94c53718aa5f86a9caaaa0b93121ccdabcece10023af0a5a74ace836b9c6610aa5bded7cacf9ad529a9a048124c4e3e891ecd32c9cb305ce4
-DIST libyui-ncurses-2.47.6.tar.gz 188365 BLAKE2B 47d13ba5109bba0d58b0ac34a6d5032328c63f1aed1fa2ffb10b9bccd3d4ba5cc7ad215e75cc14fd4089a0b4e4d4702e1409f798aae85febaacc2567454ce17e SHA512 c11b4ac6e7d2e5fce52e39abbea5c9c280128071802ee925c00560642cb03e734393b348dc57d3aaff29993b36cdbc371f5766839640162a6e1310810c66e343
-EBUILD libyui-ncurses-2.47.6.ebuild 1218 BLAKE2B 310b1659a1e8f761c6671e842b1d75b420b1393ea2745b0c9e413a5b280b29a10b9d614de6ff3ef56dad3cc1db1ff56a04a5146a2bc4b5771f42a43489674a00 SHA512 358958c7686410fc0235041fb574bf28a03edf0d292d72bdb13e6d64211e61a01baaf434484c82042b0daeb756542d7f09e30c3c367e4bca5afcf8669ae681e0
+AUX libyui-ncurses-2.46.4-tinfo.patch 933 BLAKE2B a737be5956d99e025caac2ab1b8bf83fdf2e028b124a878dc1d5fdd926a48e80dd3bc77a11b321dc471c8414f765b6cd08e548160be0c8c9eafa6d6fba14d99d SHA512 f64eda593d6c8e6fdf3c2210c092ab68aea778ed0bf346d7cb42fa89dd1ee53170dfc6f2230476f79f3966d32fde20e9b42a6ab79d17fc255ed23d51176e3a23
+AUX libyui-ncurses-2.48.3-ncurses.patch 826 BLAKE2B 151d9033a179a761f87824c4c50eb441bd5eaecc5a2210407031e6377aec8a6da79cb6001f67d3255178198cb24f4cb237bb170eb1d1a023c74d17ee7d653c75 SHA512 44c47b12362ecddf1953d50f259b2ef2c63984a2de3036d76b6aa2389155b6c4ba9825db32f8872b368d16b67dd1aff0b9210404b5dfd8116feed25c01035e4c
+DIST libyui-ncurses-2.48.3.tar.gz 189621 BLAKE2B 360b12f40c6e7dace84e5e10edb32d9b75ec33cb0c796ce31697b90b17df3ac13096d7a3d715d4bf4963c487e705ab4031dbe682f99237331dad951d19c32979 SHA512 18f7cec47aba1fd33443d4154b358c7dd769ed79a5544b11d907f6de461c96fcf1f980ee602781bd3cf3242d692d02721fcf975728a0c00955b34844104419d0
+EBUILD libyui-ncurses-2.48.3.ebuild 1196 BLAKE2B 5476cde47baf2c548d03742567bfbcc3bbfb3d805cd23ae7b2facc10038c50ac728f846c77c19a59099cac089f7fc26d159e226e42154feee98d093766b6924d SHA512 598dd567a2363dd71b50566595712e83c30ce08f5283c6e6967bebf5caf5dfc88367590f910f6a1be3235a61377d32bda3575cd6221844c89a89faed69ef6340
 MISC metadata.xml 443 BLAKE2B c55b7afbd50426e6ae21ed6af37d99bab996fafa6dfe384ed2f74acac422e8becbffacf8656e0b16cd2c00f0c5882fcac67515153100d79e3290a254029300c6 SHA512 266ef9ea2d575aa247ac6f663ab2ecd0f7c9046677ea85423cfd48685f2a9e314f4ef7e9be5d12ad6080aec31b96c3422f65d64525c62d4c1d227810839963e3
diff --git a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
index b69aafe797b1..9da76f194598 100644
--- a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
+++ b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
@@ -1,7 +1,7 @@
 Fixes building with sys-libs/ncurses[tinfo]
 
---- cmake/Modules/FindCurses6.cmake.orig	2014-09-25 16:32:20.000000000 +0400
-+++ cmake/Modules/FindCurses6.cmake	2014-09-25 16:33:16.000000000 +0400
+--- a/cmake/Modules/FindCurses6.cmake	2014-09-25 16:32:20.000000000 +0400
++++ b/cmake/Modules/FindCurses6.cmake	2014-09-25 16:33:16.000000000 +0400
 @@ -11,11 +11,12 @@
    FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH)
  ENDFOREACH()
diff --git a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch
new file mode 100644
index 000000000000..7c58ce47ab69
--- /dev/null
+++ b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.48.3-ncurses.patch
@@ -0,0 +1,29 @@
+From 6444e043b58bf7703e4fc9035f380f3817207525 Mon Sep 17 00:00:00 2001
+From: Stefan Hundhammer <shundhammer@suse.de>
+Date: Thu, 4 Jan 2018 17:21:56 +0100
+Subject: [PATCH] Removed function that conflicts with newer NCurses lib
+ (bsc#1074600)
+
+---
+ src/ncursesw.h | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/src/ncursesw.h b/src/ncursesw.h
+index d25923a..c8b95bb 100644
+--- a/src/ncursesw.h
++++ b/src/ncursesw.h
+@@ -1607,14 +1607,6 @@ class NCursesWindow
+ 	return ::wtouchln( w, s, cnt, ( int )( changed ? 1 : 0 ) );
+     }
+ 
+-    /**
+-     * Return TRUE if line is marked as changed, FALSE otherwise
+-    */
+-    bool	   is_linetouched( int line ) const
+-    {
+-	return ( ::is_linetouched( w, line ) ? TRUE : FALSE );
+-    }
+-
+     /**
+      * Return TRUE if window is marked as changed, FALSE otherwise
+     */
diff --git a/x11-libs/libyui-ncurses/libyui-ncurses-2.47.6.ebuild b/x11-libs/libyui-ncurses/libyui-ncurses-2.48.3.ebuild
index ea1993c22752..7567d80afdf0 100644
--- a/x11-libs/libyui-ncurses/libyui-ncurses-2.47.6.ebuild
+++ b/x11-libs/libyui-ncurses/libyui-ncurses-2.48.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
 DESCRIPTION="UI abstraction library - ncurses plugin"
 HOMEPAGE="https://github.com/libyui/libyui-ncurses"
-SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/libyui/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/6"
@@ -15,16 +15,19 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="static-libs"
 
-RDEPEND="sys-libs/ncurses:=
+RDEPEND="
+	sys-libs/ncurses:0=
 	x11-libs/libyui:${SLOT}
 "
 # Only Boost headers are needed
 DEPEND="${RDEPEND}
-	dev-libs/boost"
-
-PATCHES=( "${FILESDIR}/${PN}-2.46.4-tinfo.patch" )
+	dev-libs/boost
+"
 
-S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.46.4-tinfo.patch"
+	"${FILESDIR}/${P}-ncurses.patch"
+)
 
 src_prepare() {
 	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
@@ -40,9 +43,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_EXAMPLES=OFF
 		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DRESPECT_FLAGS=ON
-		$(cmake-utils_use_enable static-libs STATIC)
+		-DENABLE_STATIC=$(usex static-libs)
 	)
 	cmake-utils_src_configure
 }