Fix --disable-warnings and use it when USE=ada #184700.

Package-Manager: portage-2.1.3.7

4 files changed, 41 insertions, 11 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 26a4a23f7ece..076f53000cb2 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.148 2007/07/23 01:40:58 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.149 2007/08/25 17:13:38 vapier Exp $
+
+  25 Aug 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/ncurses-5.6-build.patch, ncurses-5.6-r2.ebuild:
+  Fix --disable-warnings and use it when USE=ada #184700.
 
   23 Jul 2007; Joshua Kinard <kumba@gentoo.org> ncurses-5.6-r1.ebuild:
   Stable on mips, per #184675.
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 58f9ed591a7c..271afce17f0a 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ncurses-5.4-c++-templates.patch 351 RMD160 d9a0e9387367be813e7067b4ddeddf907a2217b8 SHA1 80471645bee521e6f154c7ff5a9acdc2e87879ef SHA256 853fc14f7ab2f5eb156b2e7d658d79243877102a18cd2845e3ebd4eb24193d7c
 MD5 118971faee11066510aa77e6c6a2c51b files/ncurses-5.4-c++-templates.patch 351
 RMD160 d9a0e9387367be813e7067b4ddeddf907a2217b8 files/ncurses-5.4-c++-templates.patch 351
@@ -18,6 +21,10 @@ AUX ncurses-5.5-terminfo-gnome.patch 597 RMD160 08f295ee2441dfae36b692f29fdb39dc
 MD5 d4e86212987c8a600a510b09d1c27090 files/ncurses-5.5-terminfo-gnome.patch 597
 RMD160 08f295ee2441dfae36b692f29fdb39dcd7e1390a files/ncurses-5.5-terminfo-gnome.patch 597
 SHA256 cc5110c84c1cdfdc13ea11c8cecf0f48a35c4096a25e10ba814889e5f3df2696 files/ncurses-5.5-terminfo-gnome.patch 597
+AUX ncurses-5.6-build.patch 265 RMD160 9958f375f7b305f1b8d52b27d9da746be9175263 SHA1 16990ca2cef127711074d70f9d40d256458969e9 SHA256 51cc2319ad1f854500d76ec978897f6af92d31cebb7f454c1fd649568ad4a251
+MD5 edaaac96b5201d454558fc95eed0499d files/ncurses-5.6-build.patch 265
+RMD160 9958f375f7b305f1b8d52b27d9da746be9175263 files/ncurses-5.6-build.patch 265
+SHA256 51cc2319ad1f854500d76ec978897f6af92d31cebb7f454c1fd649568ad4a251 files/ncurses-5.6-build.patch 265
 AUX ncurses-5.6-gfbsd.patch 817 RMD160 2d5a96174730a93320e391cb057880df4996854e SHA1 b6798815c44059a00a2bcd4f9f28bbf74dfc0e2d SHA256 d9e94c5068a22d32f52c5db6aadc3793af11bb0c08b006e375921726931e0065
 MD5 7bd729ea90b7498696c5a7f5ac57d480 files/ncurses-5.6-gfbsd.patch 817
 RMD160 2d5a96174730a93320e391cb057880df4996854e files/ncurses-5.6-gfbsd.patch 817
@@ -38,18 +45,18 @@ EBUILD ncurses-5.6-r1.ebuild 4509 RMD160 7b18beee4f035cabd7ed73a6fb38da336a12d28
 MD5 0d06168b794883b05012f027b6a5d6f1 ncurses-5.6-r1.ebuild 4509
 RMD160 7b18beee4f035cabd7ed73a6fb38da336a12d285 ncurses-5.6-r1.ebuild 4509
 SHA256 d66f1b48a3af5059a68aac9ad0b7108fce31a033ac9c0087dc5d8f17987babb6 ncurses-5.6-r1.ebuild 4509
-EBUILD ncurses-5.6-r2.ebuild 4823 RMD160 1fb01bdf6073346669a4f6817d9848839e539c12 SHA1 312262e93e7f3fe0c95972dc674c7b7761aaada6 SHA256 52519dcfed847f4a3178c3ae753f39c40a7ed9b7422b93334283d2debf9cda2d
-MD5 be4ec33cb5c90ef665c4a150c69215d3 ncurses-5.6-r2.ebuild 4823
-RMD160 1fb01bdf6073346669a4f6817d9848839e539c12 ncurses-5.6-r2.ebuild 4823
-SHA256 52519dcfed847f4a3178c3ae753f39c40a7ed9b7422b93334283d2debf9cda2d ncurses-5.6-r2.ebuild 4823
+EBUILD ncurses-5.6-r2.ebuild 4884 RMD160 3992fc477f16a72c4ff30a754fd4146165237b86 SHA1 9888ab47e2fbbf75735092369353d5df342e2e6e SHA256 f223ada2a62aaa38b073531270a836b098cd8c6a478bb5604fe8150be8db9912
+MD5 540fb69bb3b9e799a4be09acc24e3033 ncurses-5.6-r2.ebuild 4884
+RMD160 3992fc477f16a72c4ff30a754fd4146165237b86 ncurses-5.6-r2.ebuild 4884
+SHA256 f223ada2a62aaa38b073531270a836b098cd8c6a478bb5604fe8150be8db9912 ncurses-5.6-r2.ebuild 4884
 EBUILD ncurses-5.6.ebuild 4440 RMD160 a52592fa52df37fc10b88afcd233ada177acf0f0 SHA1 c074a68dc742f17a1d5d2100fba7aa756793c1f4 SHA256 64e2c6fd56c06fea4eec93e49fbfdeaf3342a1d79c32c5f868ced17a373f87ae
 MD5 04c5c49ff9ecef9f65d4f94f76fd7049 ncurses-5.6.ebuild 4440
 RMD160 a52592fa52df37fc10b88afcd233ada177acf0f0 ncurses-5.6.ebuild 4440
 SHA256 64e2c6fd56c06fea4eec93e49fbfdeaf3342a1d79c32c5f868ced17a373f87ae ncurses-5.6.ebuild 4440
-MISC ChangeLog 21552 RMD160 2f7877160df0e0bcb8e3141bad344dfedf4b1d86 SHA1 207f81b988ea5241f5034aef181cfd405a9f2da8 SHA256 18a47b52db48e13bc3811d946b67ac13f0411a0134b5563d3e3cfb680c49a8ab
-MD5 d02ed01d1cea7c7ab8805c08111965a6 ChangeLog 21552
-RMD160 2f7877160df0e0bcb8e3141bad344dfedf4b1d86 ChangeLog 21552
-SHA256 18a47b52db48e13bc3811d946b67ac13f0411a0134b5563d3e3cfb680c49a8ab ChangeLog 21552
+MISC ChangeLog 21719 RMD160 95cafea5f7b8c68d057eb55ec507bc8da4cf67d8 SHA1 9ae25f9b04753b830dd9d75dd23ac38fd6aed7c3 SHA256 f98e1e4c94bdfb7f5a2277ea22dc48b8d5e73bdf16b2a9a33094e660f8a51b2d
+MD5 0a867cf1a2b6a47a25965f971f41bb7a ChangeLog 21719
+RMD160 95cafea5f7b8c68d057eb55ec507bc8da4cf67d8 ChangeLog 21719
+SHA256 f98e1e4c94bdfb7f5a2277ea22dc48b8d5e73bdf16b2a9a33094e660f8a51b2d ChangeLog 21719
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -69,3 +76,10 @@ SHA256 0ebdcdfd302a82613b796db3a2cfce0c7a6319992f7fc9ec80c1301444766042 files/di
 MD5 4113e58a2761a788de58821d1058f534 files/digest-ncurses-5.6-r2 500
 RMD160 467579d539f83f3e670698737d5c1a5a2b78a05b files/digest-ncurses-5.6-r2 500
 SHA256 0ebdcdfd302a82613b796db3a2cfce0c7a6319992f7fc9ec80c1301444766042 files/digest-ncurses-5.6-r2 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG0GOUp/wUKkr7RBoRArMOAJ9J2xRKSG556051IwzjhsMzoJ6H9gCeIKP3
+F5bjmGxmzS5peNRFSelPJh0=
+=kPcQ
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/ncurses-5.6-build.patch b/sys-libs/ncurses/files/ncurses-5.6-build.patch
new file mode 100644
index 000000000000..db1745815493
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.6-build.patch
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -9122,7 +9122,7 @@
+ echo "$as_me:9122: result: $with_warnings" >&5
+ echo "${ECHO_T}$with_warnings" >&6
+ 
+-if test -n "$with_warnings"; then
++if test "x$with_warnings" = "xyes"; then
+  	ADAFLAGS="$ADAFLAGS -gnatg"
+ 
+ INTEL_COMPILER=no
diff --git a/sys-libs/ncurses/ncurses-5.6-r2.ebuild b/sys-libs/ncurses/ncurses-5.6-r2.ebuild
index 3fdf308ccc2e..bdb28505c8c8 100644
--- a/sys-libs/ncurses/ncurses-5.6-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-5.6-r2.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/sys-libs/ncurses/ncurses-5.6-r2.ebuild,v 1.2 2007/07/09 14:57:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6-r2.ebuild,v 1.3 2007/08/25 17:13:38 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -27,6 +27,7 @@ src_unpack() {
 	[[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
 	epatch "${WORKDIR}"/${P}-coverity.patch
 	epatch "${FILESDIR}"/${PN}-5.6-gfbsd.patch
+	epatch "${FILESDIR}"/${PN}-5.6-build.patch #184700
 }
 
 src_compile() {
@@ -83,7 +84,7 @@ do_compile() {
 		--enable-const \
 		--enable-colorfgbg \
 		--enable-echo \
-		--enable-warnings \
+		$(use_enable !ada warnings) \
 		$(use_with debug assertions) \
 		$(use_with !debug leaks) \
 		$(use_with debug expanded) \