punt binary incompatible ncurses

Package-Manager: portage-2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/

4 files changed, 9 insertions, 198 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 3a92bfd5a572..bd570bc3ca83 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,16 +1,12 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.100 2005/09/14 04:15:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.101 2005/09/16 02:53:19 vapier Exp $
 
-  14 Sep 2005; Mike Frysinger <vapier@gentoo.org>
-  ncurses-5.4.20050827.ebuild:
-  New ncurses seems to be slightly incompatible ...
+*ncurses-5.4.20050827 (15 Sep 2005)
 
-*ncurses-5.4.20050827 (12 Sep 2005)
-
-  12 Sep 2005; Mike Frysinger <vapier@gentoo.org>
-  +ncurses-5.4.20050827.ebuild:
-  Version bump.
+  15 Sep 2005; Mike Frysinger <vapier@gentoo.org> -ncurses-5.4.20050827.ebuild:
+  Punt since it is binary incompat with earlier versions.  Next jumbo patchset 
+  should address this though.
 
   29 Jun 2005; Joshua Kinard <kumba@gentoo.org> ncurses-5.4-r6.ebuild:
   Marked stable on mips.
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 72efce902451..3fd63fc3a191 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -3,9 +3,8 @@ Hash: SHA1
 
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 45af8f6f6c26f746944e5e170f4ce537 ncurses-5.4.20050319.ebuild 5741
-MD5 dd4361a892d54d3e25fe3e9a643932d5 ncurses-5.4.20050827.ebuild 5699
 MD5 d303a209fc62dfcb17c00343f1fc6dcb ncurses-5.4-r6.ebuild 5385
-MD5 c19791453224f3443cd0baa30ccce337 ChangeLog 15601
+MD5 aa4fbc6553dab4a8d785cd82b0f4e077 ChangeLog 15559
 MD5 a885c047e0ef76d733b76f158c480f2a ncurses-5.4-r5.ebuild 6147
 MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r6 64
@@ -14,11 +13,10 @@ MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686
 MD5 97d66c7857e4be9c07d6ae8d7798a16c files/digest-ncurses-5.4.20050319 142
 MD5 118971faee11066510aa77e6c6a2c51b files/ncurses-5.4-c++-templates.patch 351
 MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
-MD5 4b5daf828a4f7ef8c4bb3d68617cf22d files/digest-ncurses-5.4.20050827 142
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDJ6P8gIKl8Uu19MoRAnG8AJ9R/SWSN3ZJtLh9R5EgmwDRiFaqIACeIM9b
-78E2wNABIn3SM475keOcnJ0=
-=ZL/Z
+iD8DBQFDKjO3gIKl8Uu19MoRApKvAJ9O1bNz/OQChptnb3ccKbD7ALt/XgCfc5vx
+3C+Ljc4wTCn7FAE3L7U6Qmo=
+=+Vpd
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.4.20050827 b/sys-libs/ncurses/files/digest-ncurses-5.4.20050827
deleted file mode 100644
index e81bbade5998..000000000000
--- a/sys-libs/ncurses/files/digest-ncurses-5.4.20050827
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 069c8880072060373290a4fefff43520 ncurses-5.4.tar.gz 2154022
-MD5 12ea736718b8f47bf8463ad7cc83988d ncurses-5.4-20050827-patch.sh.bz2 674804
diff --git a/sys-libs/ncurses/ncurses-5.4.20050827.ebuild b/sys-libs/ncurses/ncurses-5.4.20050827.ebuild
deleted file mode 100644
index d9bc892878b6..000000000000
--- a/sys-libs/ncurses/ncurses-5.4.20050827.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# 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.20050827.ebuild,v 1.2 2005/09/14 04:15:40 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_PV=${PV:0:3}
-PV_SNAP=${PV:4}
-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
-	ftp://invisible-island.net/ncurses/${MY_PV}/${MY_P}-${PV_SNAP}-patch.sh.bz2"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="-*"
-#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 )"
-
-S=${WORKDIR}/${MY_P}
-
-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 "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
-	epatch "${FILESDIR}"/${MY_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}
-
-	local mylibprefix=""
-	[[ ${USERLAND} == "Darwin" ]] && mylibprefix="/usr"
-
-	# 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=${mylibprefix}/$(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"
-
-	if [[ ${USERLAND} != "Darwin" ]] ; then
-		# Move static and extraneous ncurses libraries out of /lib
-		dodir /usr/$(get_libdir)
-		cd "${D}"/$(get_libdir)
-		mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/
-		gen_usr_ldscript lib{,n}curses.so
-		use unicode && gen_usr_ldscript lib{,n}cursesw.so
-	fi
-
-	# 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 -pPR l/linux n/nxterm v/vt100 "${T}"
-		rm -rf *
-		mkdir l x v
-		cp -pPR "${T}"/linux l
-		cp -pPR "${T}"/nxterm x/xterm
-		cp -pPR "${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
-}