Install both normal ncurses and wide ncurses with USE=unicode. Take a page from RedHat to do this.

Package-Manager: portage-2.0.51.19

4 files changed, 186 insertions, 16 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 6354a7c4de1c..17090817ff59 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.90 2005/03/22 18:48:59 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.91 2005/03/23 05:01:01 vapier Exp $
+
+*ncurses-5.4-r6 (23 Mar 2005)
+
+  23 Mar 2005; Mike Frysinger <vapier@gentoo.org> +ncurses-5.4-r6.ebuild:
+  Install both normal ncurses and wide ncurses with USE=unicode. Take a page
+  from RedHat to do this.
 
   22 Mar 2005; Heinrich Wendel <lanius@gentoo.org> ncurses-5.4-r5.ebuild:
   add warning for bug #78313
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index dd50158dccfa..559af3fa84bd 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1d92671261d5e5ddcb50f26da871bdf8 ncurses-8.1.ebuild 406
-MD5 9b518840fa3acf0dc47a06bcafa05b4f ncurses-5.4-r5.ebuild 6086
-MD5 9eda8b626d7aff90b3bb8962185f935c ChangeLog 14304
+MD5 ecaa9d031cdc7e68f6c73824598fbc7f ChangeLog 14513
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 2b33e5c69f68ff6735408e417c6c093d ncurses-5.4-r6.ebuild 5409
+MD5 9b518840fa3acf0dc47a06bcafa05b4f ncurses-5.4-r5.ebuild 6086
+MD5 1d92671261d5e5ddcb50f26da871bdf8 ncurses-8.1.ebuild 406
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r6 64
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ncurses-8.1 0
-MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r5 64
 MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
 MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r5 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCQGmFevY57Fted3ERAnU/AJ0Ra/3ILiiC3Je5gKtrunrPE/9OagCgnIVC
-Lr8jGLP6fi0bEUThB2uZjVM=
-=6kFk
------END PGP SIGNATURE-----
+MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.4-r6 b/sys-libs/ncurses/files/digest-ncurses-5.4-r6
new file mode 100644
index 000000000000..fdf84beb38f9
--- /dev/null
+++ b/sys-libs/ncurses/files/digest-ncurses-5.4-r6
@@ -0,0 +1 @@
+MD5 069c8880072060373290a4fefff43520 ncurses-5.4.tar.gz 2154022
diff --git a/sys-libs/ncurses/ncurses-5.4-r6.ebuild b/sys-libs/ncurses/ncurses-5.4-r6.ebuild
new file mode 100644
index 000000000000..f148058e4a2f
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.4-r6.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r6.ebuild,v 1.1 2005/03/23 05:01:01 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="console display library"
+HOMEPAGE="http://www.gnu.org/software/ncurses/"
+SRC_URI="mirror://gnu/ncurses/${P}.tar.gz
+	ftp://invisible-island.net/ncurses/5.4/ncurses-5.4-20050319-patch.sh.bz2"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="gpm build bootstrap debug doc minimal unicode nocxx"
+
+DEPEND="gpm? ( sys-libs/gpm )"
+
+pkg_setup() {
+	# check for unicode use flag, see bug #78313
+	if ! use unicode && [[ -f ${ROOT}/usr/lib/libncursesw.so ]] && [[ ${COMPILE_NCURSES} != "true" ]] ; then
+		ewarn "Remerging ncurses without unicode in USE flags may break your system."
+		ewarn "For more information see http://bugs.gentoo.org/78313"
+		ewarn "If you still want continue, export COMPILE_NCURSES to 'true'."
+		die "refusing to rebuild ncurses w/out unicode"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-xterm.patch
+	epatch "${FILESDIR}"/${P}-share-sed.patch #42336
+}
+
+src_compile() {
+	tc-export BUILD_CC
+	filter-flags -fno-exceptions
+
+	# From version 5.3, ncurses also build c++ bindings, and as
+	# we do not have a c++ compiler during bootstrap, disable
+	# building it.  We will rebuild ncurses after gcc's second
+	# build in bootstrap.sh.
+	local myconf=""
+	( use build || use bootstrap || use nocxx ) \
+		&& myconf="${myconf} --without-cxx --without-cxx-binding --without-ada"
+
+	# First we build the regular ncurses ...
+	mkdir "${WORKDIR}"/narrowc
+	cd "${WORKDIR}"/narrowc
+	do_compile ${myconf}
+
+	# Then we build the UTF-8 version
+	if use unicode ; then
+		mkdir "${WORKDIR}"/widec
+		cd "${WORKDIR}"/widec
+		do_compile ${myconf} --enable-widec --includedir=/usr/include/ncursesw
+	fi
+}
+do_compile() {
+	ECONF_SOURCE=${S}
+
+	# We need the basic terminfo files in /etc, bug #37026.  We will
+	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+	# src_install() ...
+	econf \
+		--libdir=/$(get_libdir) \
+		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
+		--disable-termcap \
+		--with-shared \
+		--with-rcs-ids \
+		--without-ada \
+		--enable-symlinks \
+		--program-prefix="" \
+		$(use_with debug) \
+		$(use_with gpm) \
+		"$@" \
+		|| die "configure failed"
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.  -vapier
+	emake -j1 sources || die "make sources failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	# install unicode version first so that the non-unicode
+	# files overwrite the unicode versions
+	if use unicode ; then
+		cd "${WORKDIR}"/widec
+		sed -i '2iexit 0' man/edit_man.sh
+		make DESTDIR="${D}" install || die "make widec install failed"
+	fi
+	cd "${WORKDIR}"/narrowc
+	make DESTDIR="${D}" install || die "make narrowc install failed"
+
+	# Move static and extraneous ncurses libraries out of /lib
+	dodir /usr/$(get_libdir)
+	cd "${D}"/$(get_libdir)
+	mv libform* libmenu* libpanel* *.a "${D}"/usr/$(get_libdir)/
+	gen_usr_ldscript lib{,n}curses.so
+	use unicode && gen_usr_ldscript lib{,n}cursesw.so
+
+	# We need the basic terminfo files in /etc, bug #37026
+	einfo "Installing basic terminfo files in /etc..."
+	for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} \
+	         xterm xterm-color xterm-xfree86
+	do
+		local termfile=$(find "${D}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+		local basedir=$(basename $(dirname "${termfile}"))
+
+		if [[ -n ${termfile} ]] ; then
+			dodir /etc/terminfo/${basedir}
+			mv ${termfile} "${D}"/etc/terminfo/${basedir}/
+			dosym ../../../../etc/terminfo/${basedir}/${x} \
+				/usr/share/terminfo/${basedir}/${x}
+		fi
+	done
+
+	# Build fails to create this ...
+	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
+	doenvd "${T}"/50ncurses
+
+	if use build ; then
+		cd "${D}"
+		rm -rf usr/share/man
+		cd usr/share/terminfo
+		cp -a l/linux n/nxterm v/vt100 "${T}"
+		rm -rf *
+		mkdir l x v
+		cp -a "${T}"/linux l
+		cp -a "${T}"/nxterm x/xterm
+		cp -a "${T}"/vt100 v
+	else
+		# Install xterm-debian terminfo entry to satisfy bug #18486
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \
+		TERMINFO=${D}/usr/share/terminfo \
+			"${D}"/usr/bin/tic "${FILESDIR}"/xterm-debian.ti
+
+		if use minimal ; then
+			cp "${D}"/usr/share/terminfo/x/xterm-debian "${D}"/etc/terminfo/x/
+			rm -r "${D}"/usr/share/terminfo
+		fi
+
+		cd "${S}"
+		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+		use doc && dohtml -r doc/html/
+	fi
+}
+
+pkg_preinst() {
+	if [[ ! -f ${ROOT}/etc/env.d/50ncurses ]] ; then
+		mkdir -p "${ROOT}"/etc/env.d
+		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \
+			"${ROOT}"/etc/env.d/50ncurses
+	fi
+}
+
+pkg_postinst() {
+	# Old ncurses may still be around from old build tbz2's.
+	rm -f "${ROOT}"/lib/libncurses.so.5.[23] "${ROOT}"/usr/lib/lib{form,menu,panel}.so.5.[23]
+	if [[ $(get_libdir) != "lib" ]] ; then
+		rm -f "${ROOT}"/$(get_libdir)/libncurses.so.5.[23] \
+			"${ROOT}"/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
+	fi
+}