Respect user CFLAGS (bug #239931 by Diego Pettenò)

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 80 insertions, 2 deletions

diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog
index ae6e3554f97f..5ed26df16efa 100644
--- a/app-editors/nvi/ChangeLog
+++ b/app-editors/nvi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/nvi
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.64 2008/07/05 04:24:06 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.65 2008/10/05 14:52:40 truedfx Exp $
+
+*nvi-1.81.6-r1 (05 Oct 2008)
+
+  05 Oct 2008; Harald van Dijk <truedfx@gentoo.org> +nvi-1.81.6-r1.ebuild:
+  Respect user CFLAGS (bug #239931 by Diego Pettenò)
 
   05 Jul 2008; <ricmm@gentoo.org> nvi-1.81.5-r3.ebuild,
   nvi-1.81.5-r6.ebuild:
diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
index 73cebf522e34..faafe2970e86 100644
--- a/app-editors/nvi/Manifest
+++ b/app-editors/nvi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nvi-1.81.5-build.patch 5616 RMD160 94456cee460a371ba65565103e0e220d85cf6bec SHA1 539960d2362fad865544a37799ab5fc3233e77fe SHA256 b8bffc7446047f366c831041620bbd382b0118e17c8dd4b2e8dc0b2050c99461
 AUX nvi-1.81.5-db4.patch 6288 RMD160 cf2ed5ea2a3bee407c6552d939d3fa5fcc3c5c9f SHA1 29b047ff3bb88dec4f3d6e7ffaa50bcd562582fa SHA256 aa569f39677027870722856fd07c8087b563c843423484e35fba65a0545cbc2f
 AUX nvi-1.81.5-gcc4.patch 4897 RMD160 112ea6512b5911185f81fac4a3c83826ae3ef709 SHA1 6d63d72f289649acb6129a944b2c019458251c30 SHA256 9555eb2dc52881d0a9e46b8b4212211f5c2202412f7a7f39633daa5a5842bc3b
@@ -10,6 +13,14 @@ DIST nvi-1.81.6.tar.bz2 1758309 RMD160 0db8568bea96392d9a027044177c60317c8ade36
 EBUILD nvi-1.81.5-r3.ebuild 1728 RMD160 1cbbe2647ba64d3ebbf6f6133a3db8a28f11c242 SHA1 b2ee85bdc76abd79b037a89d560bd1c4ec9840a7 SHA256 3c7f17a533d6d60136441fcd6ce7c4169af8728ada4d81749793bf0fe065f823
 EBUILD nvi-1.81.5-r6.ebuild 1393 RMD160 cd62a8801a8f245e4d6baa9fdeca451c34b8ab34 SHA1 36ea69ed56546e67d8593e1d204f7bdff17a593d SHA256 fe56b0befe432e094b660943ee69c30f8a2967452f1ff5f1dc8be92c305c04ef
 EBUILD nvi-1.81.5-r7.ebuild 1494 RMD160 0243df6b5ad5b7498440c9ee75dbb1a0e71b226b SHA1 e85a706ea04d0404cd38082c9331bb0a309f1bad SHA256 8c2858a3777a2cded42173d0c637e3c8423ef62c003398a59959772e2338be74
+EBUILD nvi-1.81.6-r1.ebuild 1494 RMD160 d035924f6abd9ece7b5a35b2767d55ec142f46a8 SHA1 2c617c849bf3eb85376acdba74f16de1b5106fad SHA256 77bf4212f73669ae3f303f5420a101c08a15f9c5bd83d466987333dea42c8646
 EBUILD nvi-1.81.6.ebuild 1465 RMD160 38ad055765b0040a77a8433356f99f1a1d2b5609 SHA1 e794c65bfff09d72cc22a982a1ec3e99e59e98dd SHA256 8dc902896a6a98bc7e9bd5cdf52686f5270f4e257999584f903148497e9d86ff
-MISC ChangeLog 8665 RMD160 4b500a14a0a5d88a45c52a68f8dede04f8c1405c SHA1 a46d0d03dfa5d68240cf686646305e7848b3d80c SHA256 f86edebd9647f7149e1a38afcd371dfd32ebb91566eee79fdfc58c3fca2e7c77
+MISC ChangeLog 8827 RMD160 cd9ee2e469aa40fc0a0db1296741460e3ee4f2cc SHA1 f30400d488471c49654a38a48dc3c8e06a580e44 SHA256 47f1b7836c4be553167b507d8d104134308bce5c752083e0712f5e0dd1bf8b9b
 MISC metadata.xml 250 RMD160 61af8ec7e1bf9941d107eff4cc6a639874a6f198 SHA1 7ea68a3bd071637e4a49b61b2f7e35f3277545ef SHA256 aec181c304bce77cce8f1dc110e0203bc06b7c524ab40b1aac19a6f72aefdfde
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjo1MIACgkQwnQyISwouHwzywCffzg2oQYACpgxyfypngeD43+r
+7sAAoJj9mLBu19ZzqrKJ8b+7d+SsW8KO
+=adhD
+-----END PGP SIGNATURE-----
diff --git a/app-editors/nvi/nvi-1.81.6-r1.ebuild b/app-editors/nvi/nvi-1.81.6-r1.ebuild
new file mode 100644
index 000000000000..6e6206620c66
--- /dev/null
+++ b/app-editors/nvi/nvi-1.81.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r1.ebuild,v 1.1 2008/10/05 14:52:40 truedfx Exp $
+
+DESCRIPTION="Vi clone"
+HOMEPAGE="http://www.bostic.com/vi/"
+SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.bz2"
+
+LICENSE="Sleepycat"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="perl tcl unicode"
+
+DEPEND="=sys-libs/db-4*
+	perl? ( dev-lang/perl )
+	tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) )"
+RDEPEND="${DEPEND}
+	app-admin/eselect-vi"
+
+S=${WORKDIR}/${P}/build.unix
+
+pkg_setup() {
+	if use tcl && use unicode
+	then
+		ewarn "nvi does not support tcl+unicode. tcl support will not be included."
+		ewarn "If you need tcl support, please disable the unicode flag."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	chmod +x ../dist/findconfig
+}
+
+src_compile() {
+	local myconf
+
+	use perl && myconf="${myconf} --enable-perlinterp"
+	use tcl && ! use unicode && myconf="${myconf} --enable-tclinterp"
+	use unicode && myconf="${myconf} --enable-widechar"
+
+	ECONF_SOURCE=../dist econf \
+		--program-prefix=n \
+		${myconf} \
+		|| die "configure failed"
+	emake OPTFLAG="${CFLAGS}" || die "make failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "install failed"
+}
+
+pkg_postinst() {
+	einfo "Setting /usr/bin/vi symlink"
+	eselect vi update --if-unset
+}
+
+pkg_postrm() {
+	einfo "Updating /usr/bin/vi symlink"
+	eselect vi update --if-unset
+}