From e74783b162c8fb55d891aa84857f04cb75978ace Mon Sep 17 00:00:00 2001 From: Harald van Dijk Date: Thu, 15 Mar 2007 22:16:19 +0000 Subject: [PATCH] Parse options correctly with USE=unicode, and remove broken unicode option for -r5 (#171069) Package-Manager: portage-2.1.2.2 --- app-editors/nvi/ChangeLog | 10 ++- app-editors/nvi/Manifest | 37 ++++++++--- app-editors/nvi/files/digest-nvi-1.81.5-r6 | 3 + app-editors/nvi/files/nvi-1.81.5-wide-2.patch | 13 ++++ app-editors/nvi/nvi-1.81.5-r5.ebuild | 6 +- app-editors/nvi/nvi-1.81.5-r6.ebuild | 62 +++++++++++++++++++ 6 files changed, 119 insertions(+), 12 deletions(-) create mode 100644 app-editors/nvi/files/digest-nvi-1.81.5-r6 create mode 100644 app-editors/nvi/files/nvi-1.81.5-wide-2.patch create mode 100644 app-editors/nvi/nvi-1.81.5-r6.ebuild diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog index 0f3f9cb44282..6fd29dbb2245 100644 --- a/app-editors/nvi/ChangeLog +++ b/app-editors/nvi/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-editors/nvi # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.45 2007/03/15 17:32:29 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.46 2007/03/15 22:16:19 truedfx Exp $ + + 15 Mar 2007; Harald van Dijk + +files/nvi-1.81.5-wide-2.patch, nvi-1.81.5-r5.ebuild, + +nvi-1.81.5-r6.ebuild: + Parse options correctly with USE=unicode, and remove broken unicode option + for -r5 (#171069) + +*nvi-1.81.5-r6 (15 Mar 2007) 15 Mar 2007; Markus Rothe nvi-1.81.5-r5.ebuild: Stable on ppc64; bug #170745 diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest index d11fbfd70846..a17a507b3bcc 100644 --- a/app-editors/nvi/Manifest +++ b/app-editors/nvi/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX nvi-1.79-build.patch 2118 RMD160 32d9b51f7f1420db3b0d3b86cb8943dd787885dc SHA1 6370b74ff936311d97e1deefd0b5d36adce8e9df SHA256 8c2308f37591c41649aedaf2400704e4be1b4c25c4f4cf8257ac51da7cb8a4b5 MD5 c06a0131cbb66e5a377df2ad572d9ea5 files/nvi-1.79-build.patch 2118 RMD160 32d9b51f7f1420db3b0d3b86cb8943dd787885dc files/nvi-1.79-build.patch 2118 @@ -18,6 +21,10 @@ AUX nvi-1.81.5-tcsetattr.patch 565 RMD160 a086c01ffe498b1472cfde7cf1a261b79280df MD5 e4c11bab15aaee62f61cbe103c890cb9 files/nvi-1.81.5-tcsetattr.patch 565 RMD160 a086c01ffe498b1472cfde7cf1a261b79280df85 files/nvi-1.81.5-tcsetattr.patch 565 SHA256 1e912b57ceb65370540c28ca6114a0254eb4238583d7eb4850d4f3d437141b26 files/nvi-1.81.5-tcsetattr.patch 565 +AUX nvi-1.81.5-wide-2.patch 340 RMD160 5decec518d3b9b5e2963a0175c3f8afd467f7324 SHA1 c5c5ef21dd2b0d22b2f0887ffd10ea6ed90f62cd SHA256 b5df517b8dbdf6dda99520ed872e5a0c8c842789ec16491cfcaf3c1d879d1e30 +MD5 1ccd1bdd80866c2a85afcd1a23aa9b30 files/nvi-1.81.5-wide-2.patch 340 +RMD160 5decec518d3b9b5e2963a0175c3f8afd467f7324 files/nvi-1.81.5-wide-2.patch 340 +SHA256 b5df517b8dbdf6dda99520ed872e5a0c8c842789ec16491cfcaf3c1d879d1e30 files/nvi-1.81.5-wide-2.patch 340 AUX nvi-1.81.5-wide.patch 2464 RMD160 b6515008120041bd1888dc55253cb5b224c58dff SHA1 b5513b2832450d5a302b3f3837c352a90a9b6e62 SHA256 99139bb3762a800af88e38fcb826fde8a95cfd8feb803a30f42616a15bb71691 MD5 8cbb25c05b847c738b548ee0c60db86e files/nvi-1.81.5-wide.patch 2464 RMD160 b6515008120041bd1888dc55253cb5b224c58dff files/nvi-1.81.5-wide.patch 2464 @@ -46,18 +53,22 @@ EBUILD nvi-1.81.5-r3.ebuild 1752 RMD160 062d939badcbcd50c7e247701e5bf0e45f853052 MD5 b37d4ad3451b77cbcbc1b0552b7054bb nvi-1.81.5-r3.ebuild 1752 RMD160 062d939badcbcd50c7e247701e5bf0e45f853052 nvi-1.81.5-r3.ebuild 1752 SHA256 97b3a7c14c5f7c179dec7c17d6afd4a102b81879aaec43d87075db573175c878 nvi-1.81.5-r3.ebuild 1752 -EBUILD nvi-1.81.5-r5.ebuild 1419 RMD160 ea9c08b2ad75a484ee33aca51b74907082f433cf SHA1 a357067adde627aa4391256f9e11eef99370e440 SHA256 84b1e5a04b3889783a89c277aa4aca799102ec0b768e169b6722423b4c09a482 -MD5 ad8d4f1500f14b8329f28f729ee4a622 nvi-1.81.5-r5.ebuild 1419 -RMD160 ea9c08b2ad75a484ee33aca51b74907082f433cf nvi-1.81.5-r5.ebuild 1419 -SHA256 84b1e5a04b3889783a89c277aa4aca799102ec0b768e169b6722423b4c09a482 nvi-1.81.5-r5.ebuild 1419 +EBUILD nvi-1.81.5-r5.ebuild 1422 RMD160 e9b8209529fc01280065920ba637e714e17d225f SHA1 1e583936d62701d8cca0a89e965a3b7c954ccb72 SHA256 5bb4b9f7ddab19b75e58df4b9601c50bad5ab8ae34885fab61d4e05ad9479b72 +MD5 0d89ab68f2a96eca0fc56b089bcd1676 nvi-1.81.5-r5.ebuild 1422 +RMD160 e9b8209529fc01280065920ba637e714e17d225f nvi-1.81.5-r5.ebuild 1422 +SHA256 5bb4b9f7ddab19b75e58df4b9601c50bad5ab8ae34885fab61d4e05ad9479b72 nvi-1.81.5-r5.ebuild 1422 +EBUILD nvi-1.81.5-r6.ebuild 1464 RMD160 025e72b830fffc99a91be05ef5caaf3b00c1ad98 SHA1 9aa928d0b711806736ca7737d5ec9683fdd198d3 SHA256 b1f1f5fd7f4105b9b29d51274c4eb4fa2479a3a302e467a8d278347bbc34a4a1 +MD5 de97fc7971f1a720b0cb82f31bbb4d1d nvi-1.81.5-r6.ebuild 1464 +RMD160 025e72b830fffc99a91be05ef5caaf3b00c1ad98 nvi-1.81.5-r6.ebuild 1464 +SHA256 b1f1f5fd7f4105b9b29d51274c4eb4fa2479a3a302e467a8d278347bbc34a4a1 nvi-1.81.5-r6.ebuild 1464 EBUILD nvi-1.81.5.ebuild 740 RMD160 603b62f186c042dbaf123db499f02a1df4fb7f50 SHA1 61b1f847cccadf7b79e09926e078a5701c93079b SHA256 ec13fa09cbea157fec2ed0abf9aba9d4c908410d165d15da62631c7302a5a9fd MD5 097be8de63d6000e28275ce4ca15e3b5 nvi-1.81.5.ebuild 740 RMD160 603b62f186c042dbaf123db499f02a1df4fb7f50 nvi-1.81.5.ebuild 740 SHA256 ec13fa09cbea157fec2ed0abf9aba9d4c908410d165d15da62631c7302a5a9fd nvi-1.81.5.ebuild 740 -MISC ChangeLog 6142 RMD160 9d7d4e37a02378a07346a54ee4c54d79b0ac8e76 SHA1 228a47d2ee70d1e51ac6a3e5a4f187ff7670a192 SHA256 d6ea29a2b021e32e266d3dfada1292c2df5a3bd65ebc71c60e66355d89e00ab6 -MD5 cdf1bffc5f94f1228dbb058fb460e0f4 ChangeLog 6142 -RMD160 9d7d4e37a02378a07346a54ee4c54d79b0ac8e76 ChangeLog 6142 -SHA256 d6ea29a2b021e32e266d3dfada1292c2df5a3bd65ebc71c60e66355d89e00ab6 ChangeLog 6142 +MISC ChangeLog 6403 RMD160 5059a4c83a774c99ba438b73955c9c922042a765 SHA1 0c4e8d4058e83ea7bd6cf2efff19493362feed6f SHA256 aeb6b0c7f65ecced5c5029b49eb3ce54af25e8b649fabab5bb3cb19218b98acc +MD5 6d2df2a40e75a4fcc208bcd770f7df78 ChangeLog 6403 +RMD160 5059a4c83a774c99ba438b73955c9c922042a765 ChangeLog 6403 +SHA256 aeb6b0c7f65ecced5c5029b49eb3ce54af25e8b649fabab5bb3cb19218b98acc ChangeLog 6403 MISC metadata.xml 229 RMD160 062ecd5166b6dc7b58f6628fbe66726d6e6e9d86 SHA1 e73c39033b0ba91260f9204c2e1671d241ade7f2 SHA256 8a284b9b59c3f0170e57a942a872e0251f6c691e8b8f6076187b0c3228664d79 MD5 d2f99257546fd32545332a3cce582cd9 metadata.xml 229 RMD160 062ecd5166b6dc7b58f6628fbe66726d6e6e9d86 metadata.xml 229 @@ -83,3 +94,13 @@ SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/di MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5-r5 235 RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5-r5 235 SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5-r5 235 +MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5-r6 235 +RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5-r6 235 +SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5-r6 235 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFF+cXAwnQyISwouHwRAjqGAJ4v9vEL0g7163w1/E1bTUV1+c2d8QCgrPwO +kZBHY5Bn4YMZqVxRp/Crzp0= +=+4M5 +-----END PGP SIGNATURE----- diff --git a/app-editors/nvi/files/digest-nvi-1.81.5-r6 b/app-editors/nvi/files/digest-nvi-1.81.5-r6 new file mode 100644 index 000000000000..ebc8a212032c --- /dev/null +++ b/app-editors/nvi/files/digest-nvi-1.81.5-r6 @@ -0,0 +1,3 @@ +MD5 5cc674f049054f3e8f7600df8d8d5cf4 nvi-1.81.5.tar.gz 1628555 +RMD160 d1cfd4a87250baea4832ed6cac69ed18e6880915 nvi-1.81.5.tar.gz 1628555 +SHA256 4c6b5c13999d8883da85e49e6dc2d02dddc084ac24fc72102cc372c5a0b7e745 nvi-1.81.5.tar.gz 1628555 diff --git a/app-editors/nvi/files/nvi-1.81.5-wide-2.patch b/app-editors/nvi/files/nvi-1.81.5-wide-2.patch new file mode 100644 index 000000000000..7b63b46c4c3c --- /dev/null +++ b/app-editors/nvi/files/nvi-1.81.5-wide-2.patch @@ -0,0 +1,13 @@ +Correctly check option strings, bug #171069 + +--- nvi-1.81.5/common/options.c ++++ nvi-1.81.5/common/options.c +@@ -1055,7 +1055,7 @@ + continue; + if (op->name[0] > name[0]) + break; +- if (!memcmp(op->name, name, len)) { ++ if (!memcmp(op->name, name, len * sizeof(CHAR_T))) { + if (found != NULL) + return (NULL); + found = op; diff --git a/app-editors/nvi/nvi-1.81.5-r5.ebuild b/app-editors/nvi/nvi-1.81.5-r5.ebuild index d8cbc018c31d..f75b9b185433 100644 --- a/app-editors/nvi/nvi-1.81.5-r5.ebuild +++ b/app-editors/nvi/nvi-1.81.5-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r5.ebuild,v 1.6 2007/03/15 17:32:29 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r5.ebuild,v 1.7 2007/03/15 22:16:19 truedfx Exp $ inherit eutils @@ -11,7 +11,7 @@ SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz" LICENSE="Sleepycat" SLOT="0" KEYWORDS="~alpha amd64 hppa ~mips ~ppc ppc64 sparc x86" -IUSE="perl unicode" +IUSE="perl" # unicode DEPEND="=sys-libs/db-4*" RDEPEND="${DEPEND} @@ -35,7 +35,7 @@ src_compile() { local myconf use perl && myconf="${myconf} --enable-perlinterp" - use unicode && myconf="${myconf} --enable-widechar" + #use unicode && myconf="${myconf} --enable-widechar" cd build.unix ECONF_SOURCE=../dist econf \ diff --git a/app-editors/nvi/nvi-1.81.5-r6.ebuild b/app-editors/nvi/nvi-1.81.5-r6.ebuild new file mode 100644 index 000000000000..07d380bf05a3 --- /dev/null +++ b/app-editors/nvi/nvi-1.81.5-r6.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r6.ebuild,v 1.1 2007/03/15 22:16:19 truedfx Exp $ + +inherit eutils + +DESCRIPTION="Vi clone" +HOMEPAGE="http://www.bostic.com/vi/" +SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz" + +LICENSE="Sleepycat" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="perl unicode" + +DEPEND="=sys-libs/db-4*" +RDEPEND="${DEPEND} + app-admin/eselect-vi" +PROVIDE="virtual/editor" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-build.patch + # Fix bug 23888 + epatch "${FILESDIR}"/${P}-tcsetattr.patch + # Fix bug 150169 + epatch "${FILESDIR}"/${P}-wide.patch + epatch "${FILESDIR}"/${P}-wide-2.patch + epatch "${FILESDIR}"/${P}-gcc4.patch + epatch "${FILESDIR}"/${P}-db4.patch + touch "${S}"/dist/{configure,aclocal.m4,Makefile.in,stamp-h.in} +} + +src_compile() { + local myconf + + use perl && myconf="${myconf} --enable-perlinterp" + use unicode && myconf="${myconf} --enable-widechar" + + cd build.unix + ECONF_SOURCE=../dist econf \ + --program-prefix=n \ + ${myconf} \ + || die "configure failed" + emake || die "make failed" +} + +src_install() { + cd build.unix + emake -j1 DESTDIR="${D}" install || die "install failed" +} + +pkg_postinst() { + einfo "Setting /usr/bin/vi symlink" + eselect vi set "${PN}" +} + +pkg_postrm() { + einfo "Updating /usr/bin/vi symlink" + eselect vi update +} -- 2.26.2