Add configure fix. Fix bug #371211.

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 38 insertions, 11 deletions

diff --git a/app-editors/ng/ChangeLog b/app-editors/ng/ChangeLog
index 0b9a28ed9141..e03d9720c85a 100644
--- a/app-editors/ng/ChangeLog
+++ b/app-editors/ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/ng
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ChangeLog,v 1.12 2010/06/28 18:04:38 angelos Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ChangeLog,v 1.13 2011/07/10 16:40:38 naota Exp $
+
+  10 Jul 2011; Naohiro Aota <naota@gentoo.org> ng-1.5_beta1-r1.ebuild,
+  +files/ng-1.5beta1-configure.patch:
+  Add configure fix. Fix bug #371211.
 
   28 Jun 2010; Christoph Mende <angelos@gentoo.org> ng-1.5_beta1.ebuild,
   ng-1.5_beta1-r1.ebuild:
diff --git a/app-editors/ng/Manifest b/app-editors/ng/Manifest
index 6cb9e5c1f507..d1d22573a785 100644
--- a/app-editors/ng/Manifest
+++ b/app-editors/ng/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX ng-1.5beta1-configure.patch 658 RMD160 1cc60859002e69b9153600b04bfc285cdbad795a SHA1 c0ba5d295b4eb6cead95277964f64eccabfa648c SHA256 58b266ea3d702dd916e5d488b1313dd6885ea545ea4a8690f4abac71e2e9ea73
 AUX ng-1.5beta1-ncurses.patch 553 RMD160 b4013180fce50c2f3babb02ee293e68b928dedb5 SHA1 ddd9767eeb7f8d4a1ce27f165d3b0ef2840495f7 SHA256 91aed88060398cab1e05117f1ede1660c467579794379d534366d3a61f7c00e3
 DIST ng-1.5beta1.tar.gz 662557 RMD160 b5874d403075d5e3b44aa529d977918333818ed4 SHA1 1c812a4994bde77f908a1b08cd68eb3ba120515a SHA256 990b2ed34f2943da71af6771c0ac9a62c36857d6e6e6ad6e7dc8782860388d3c
-EBUILD ng-1.5_beta1-r1.ebuild 1171 RMD160 7483c4d1f652a00d75480856f025a0ca3a3022cf SHA1 099552a370f06086d8a10c1c509ae66807d475ca SHA256 d627a6d8d5c7b0f7cce381f0acfbe3d3f7c0fce2fd0589c8ada08b7a61cd565c
+EBUILD ng-1.5_beta1-r1.ebuild 1260 RMD160 cffcab4be494f3fe91c7b3758f278c991d827109 SHA1 6b0b5e29389462c69438c4b21839148f83d14557 SHA256 40fba5992ed614059116e4e4f85760d60e9fb1cb7f70fb1740e52dae14fc6d7e
 EBUILD ng-1.5_beta1.ebuild 1252 RMD160 8438e85066113b02cfdd99f94d623d43e157b1cc SHA1 bb46949bd154cd06a4df58bfa7b14bff8a576342 SHA256 5b64bcac25bdac974f1d5d0ac72f21737152069cc45de604e85bda2f0ce4f966
-MISC ChangeLog 1457 RMD160 896e13374b765ac68334eb3b51062881864242bc SHA1 f6adebed1eda5c9bac0ba2206346db74a069c913 SHA256 268dac34ce7554721686191caefcb8ceea01e6a24868ec064d251ef2a20ad795
+MISC ChangeLog 1603 RMD160 769b997de5e1212d75f27621cc0faf01131b663e SHA1 66ace5d88137a9879e6818a01100282e2f60600e SHA256 c8d222f93dc8a1b8a6124024932ff8a17366d97b51fc416d3bc2c987d1030997
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAkwo5FUACgkQmWq1bYTyC0NCYgD/UTUk2UzQ8poQ48sSQ+mFPKbd
-1Don8zkBTSA6RHkqKKYBAJ1a2xdZjy9p7fU1+moQr8GCSIRH68sRwztAdVxLnsto
-=0/jC
+iEYEARECAAYFAk4Z1gMACgkQGpDnPLSHuMBBMQCfaz/we9pZmAlDpcFzRALaEgIA
+NrgAniQLZeZHOvj0HvUkvDagqaUUJvBu
+=dQAe
 -----END PGP SIGNATURE-----
diff --git a/app-editors/ng/files/ng-1.5beta1-configure.patch b/app-editors/ng/files/ng-1.5beta1-configure.patch
new file mode 100644
index 000000000000..25f383a0be2d
--- /dev/null
+++ b/app-editors/ng/files/ng-1.5beta1-configure.patch
@@ -0,0 +1,19 @@
+diff --git a/sys/unix/configure.in b/sys/unix/configure.in
+index e034edc..b62535d 100644
+--- a/sys/unix/configure.in
++++ b/sys/unix/configure.in
+@@ -83,8 +83,12 @@ AC_DEFINE_UNQUOTED(RMDIR_CMD, "$rmdir_cmd")
+ dnl If the user wants canna support.
+ AC_MSG_CHECKING(if --enable-canna option specified)
+ AC_ARG_ENABLE(canna,
+-	[  --enable-canna[=DIR]    Build a canna version.],
+-	[cv_canna="yes"; cannapath=$enableval], [cv_canna="no"])
++	[  --enable-canna[=DIR]    Build a canna version.])
++AS_IF([test "x$enable_canna" != "xno"], [
++	cv_canna="yes"; cannapath=$enableval
++][
++	cv_canna="no";
++])
+ AC_MSG_RESULT($cv_canna)
+ if test "$cv_canna" = "yes"; then
+ 
diff --git a/app-editors/ng/ng-1.5_beta1-r1.ebuild b/app-editors/ng/ng-1.5_beta1-r1.ebuild
index a34baeda7e1c..34ec0eebd391 100644
--- a/app-editors/ng/ng-1.5_beta1-r1.ebuild
+++ b/app-editors/ng/ng-1.5_beta1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ng-1.5_beta1-r1.ebuild,v 1.2 2010/06/28 18:04:38 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ng-1.5_beta1-r1.ebuild,v 1.3 2011/07/10 16:40:38 naota Exp $
 
 inherit eutils
 
@@ -27,7 +27,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${MY_P}-ncurses.patch"
+	epatch "${FILESDIR}/${MY_P}-configure.patch"
 	sed -i -e "/NO_BACKUP/s/undef/define/" config.h || die "sed failed"
+
+	autoconf sys/unix/configure.in > configure
 }
 
 src_compile() {