[patch] ncurses-5.9.20141025.patch

ncurses-5.9.20141025.patch (text/plain), 2.74 KB, created by Luke-Jr on 2014-10-31 11:03:00 UTC

--- /usr/portage/sys-libs/ncurses/ncurses-5.9-r3.ebuild	2014-08-05 16:31:18.000000000 +0000
+++ ncurses-5.9.20141025.ebuild	2014-10-31 10:54:28.000000000 +0000
@@ -6,11 +6,19 @@
 inherit eutils flag-o-matic toolchain-funcs multilib-minimal
 
 MY_PV=${PV:0:3}
-PV_SNAP=${PV:4}
+PV_SNAP="20140308"
 MY_P=${PN}-${MY_PV}
 DESCRIPTION="console display library"
 HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
-SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz
+	ftp://invisible-island.net/${PN}/${MY_PV}/ncurses-${MY_PV}-${PV_SNAP}-patch.sh.bz2
+"
+MY_EPATCHES=
+for _mmdd in 0315 0322 0323 0329 0412 0419 0426 0503 0510 0524 0607 0609 0614 0621 0629 0705 0712 0719 0726 0802 0809 0816 0823 0831 0906 0913 0920 0927 1011 1018 1025; do
+	_fn="ncurses-${MY_PV}-2014${_mmdd}.patch"
+	SRC_URI="$SRC_URI ftp://invisible-island.net/${PN}/${MY_PV}/${_fn}.gz"
+	MY_EPATCHES="$MY_EPATCHES $_fn"
+done
 
 LICENSE="MIT"
 SLOT="5"
@@ -35,11 +43,16 @@
 
 src_prepare() {
 	[[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
+	local p
+	for p in ${MY_EPATCHES}; do
+		epatch "${WORKDIR}/$p"
+		if grep -q 20140524 <<<"$p"; then
+			rm "${S}/Ada95/src/library.gpr"
+		fi
+	done
 	epatch "${FILESDIR}"/${PN}-5.8-gfbsd.patch
 	epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
-	epatch "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871
-	epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763
-	epatch "${FILESDIR}"/${PN}-5.9-pkg-config.patch
+#	epatch "${FILESDIR}"/${PN}-5.9-pkg-config.patch
 }
 
 src_configure() {
@@ -86,7 +99,7 @@
 		# is also installed.  Force the tests to go our way.  Note that it
 		# doesn't actually use pkg-config ... it just looks for set vars.
 		--enable-pc-files
-		--with-pkg-config="$(tc-getPKG_CONFIG)"
+		--with-pkg-config="$(which $(tc-getPKG_CONFIG))"
 		# This path is used to control where the .pc files are installed.
 		PKG_CONFIG_LIBDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
 
@@ -124,6 +137,9 @@
 		--without-pthread
 		--without-reentrant
 	)
+	if grep -q 'mingw' <<<"$CHOST"; then
+		conf+=( --enable-sp-funcs --enable-term-driver )
+	fi
 
 	econf "${conf[@]}" "$@"
 }
@@ -183,10 +199,10 @@
 		$(usex unicode 'ncursesw' '') \
 		$(use tinfo && usex unicode 'tinfow' '') \
 		$(usev tinfo)
-	if ! tc-is-static-only ; then
+	if ! tc-is-static-only && [[ $(get_libname) != .dll ]]; then
 		ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
 	fi
-	use static-libs || find "${ED}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
+	use static-libs || find "${ED}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -a '!' -name '*.dll.a' -delete
 
 	# Build fails to create this ...
 	dosym ../share/terminfo /usr/$(get_libdir)/terminfo