Add patch to fix build with gcc 4.7 (keep the same name since it's the same patch as ragel's).

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

4 files changed, 201 insertions, 15 deletions

diff --git a/dev-util/kelbt/ChangeLog b/dev-util/kelbt/ChangeLog
index 8003b3de33dd..a4abc0a3d82a 100644
--- a/dev-util/kelbt/ChangeLog
+++ b/dev-util/kelbt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/kelbt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kelbt/ChangeLog,v 1.5 2012/05/22 23:46:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kelbt/ChangeLog,v 1.6 2012/06/24 07:56:56 flameeyes Exp $
+
+  24 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/ragel-6.7+gcc-4.7.patch, kelbt-0.15.ebuild:
+  Add patch to fix build with gcc 4.7 (keep the same name since it's the same
+  patch as ragel's).
 
 *kelbt-0.15 (22 May 2012)
 
diff --git a/dev-util/kelbt/Manifest b/dev-util/kelbt/Manifest
index 2159e1db25e2..bd3098229477 100644
--- a/dev-util/kelbt/Manifest
+++ b/dev-util/kelbt/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ragel-6.7+gcc-4.7.patch 5585 RMD160 034ee3299109c6d5e31a4bd40bacbe9e3e50f61e SHA1 8fb3b6b53a1c790547cbe16a271294b064118f38 SHA256 bcdee795c9a063d4a42f49f2ba642a922aa705769c455b9b375bfab47c7e137c
 DIST kelbt-0.15.tar.gz 232537 RMD160 baa8a9d616f2594fe0315c3b059a1286e8ac7ccc SHA1 93b8e839b85ebd4ba99a8b8a0565a73d8e8bcaa1 SHA256 000ae8e0906f34de13c3448f2422065e48407b6d85c61bbe51490ffdab0bc565
-EBUILD kelbt-0.15.ebuild 914 RMD160 035751c2b925f1b1706f82bed409040e5c569b02 SHA1 bb16ca9512b249140806b93f387b0238b977507d SHA256 5f98a8dd1e3888545afa44254e7fb388f8343bd368bd5596254f86e1d8527ce0
-MISC ChangeLog 934 RMD160 6f16352071c3ca6aa7dbabc883af059c44db33ae SHA1 2d110b84c135c197ca4bdc8aa5788d3259adffcb SHA256 47a8edf1aefad2bd3281dc51de12c789452897704c237a90a37ebf99a059452a
+EBUILD kelbt-0.15.ebuild 933 RMD160 c417052d25234bc71c3771eb8a4756ab98162b2a SHA1 972b2c0e4d8c79f3d94a581cf98e0a5161336621 SHA256 6e86b83df38fcc946372476b2303329a028a75e4e5cdbac10fdc2e06f74cd2d5
+MISC ChangeLog 1143 RMD160 7bea1f7c34979be727efd3251b3ef1e2d2595b88 SHA1 b6cee643b4a8dd4f6fec1cf2f2553fd2e632a0c8 SHA256 90b8b08ac5eee2b9e20b7532b5f2ca6d9c2256deacf447e441610301a97f1d43
 MISC metadata.xml 279 RMD160 20d35ab434253dd77fc2a82536f1296b6a08772b SHA1 1bd34eb930f116ad564901d5b6aa1aeae38f88ea SHA256 50eea971c8ec62875a9cecd73b7a4febc6567a7148e3ba3178d990c5e420e986
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPvDUYAAoJEBzRPIrUMBNCQg4H/3oq4E1ElD2p0t4aHWkotDMd
-2Jav/1WfQky8yzRnQVoTA+L1EvvTRLA00COUNdND3HdfZynwGSKc3rT5KVJIofYI
-Y5tIFQsUmn82d2CWchHaC00ucrt6gUrcVTeXxZHBKPHd/w5WOTPWi2Bejkr8ubwF
-EGO0Yudwfdw2SAx7/nNOLagOkl8YbTAbHDQh1li4VTSv5sCw94S6COZv1JEUrE9W
-b05eXHXUDooYtEpJl7cRbbm4UIgnTF8GcoSg0xgk7at5wl5X/eOnKZbueYw51JD1
-9+XtNQBYes7wXS/5xTnWcTBI8N185rTflTjWL1YYqpjDRpdgfPQdtVFnhtyp1vA=
-=X5rv
+iQEcBAEBAgAGBQJP5shRAAoJEBzRPIrUMBNCJRwH/3lnbpgvU85D8Mti/hBC9ses
+hFwRrm8CRAeajVP3knzcSbAouUrDXwk2MO6yYmacQl8Er9Ykpx+t1vuv8FMnr8Dr
+x9ILJaYbFPq2DnAhqAjYIwuXhYbvxyWEpJYkrYA6UmYq9+Vv7vo+bZcSH/VSEWn3
+RUPzIaQkJcF/sZ6NCw4rpJIJyfZUU1eINd5hL1rqeTVw2XnX4P66UZPE1fBFJBr1
+K6HrN3SRtT29ukyzVZ/WWePY60Zt9vrBEurDR/8rbl5qD7jiUXFyFl06TQw1I5Kj
+0L8qPAW7BAMQ4K6QUKqAhOgmmIe08tREbSexi9moEbQLvOQLWlV49RPaXEeEw58=
+=w1k0
 -----END PGP SIGNATURE-----
diff --git a/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch b/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch
new file mode 100644
index 000000000000..80eb29a46f05
--- /dev/null
+++ b/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch
@@ -0,0 +1,178 @@
+From 27454d1e55b2a5cefc3cc1044d036add9ee9a6d3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Tue, 22 May 2012 16:25:37 -0700
+Subject: [PATCH] aapl: fix building with gcc-4.7.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting with GCC 4.7, you have to explicit methods inherited from
+base templates, otherwise it will refuse to build.
+
+---
+
+The URL reported in the README is no longer registered, so I couldn't
+find a way to report this to an upstream project.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ aapl/avlcommon.h  |   12 ++++++------
+ aapl/bstcommon.h  |   16 ++++++++--------
+ aapl/bubblesort.h |    2 +-
+ aapl/mergesort.h  |    2 +-
+ 4 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/aapl/avlcommon.h b/aapl/avlcommon.h
+index 06983bc..2e3c190 100644
+--- a/aapl/avlcommon.h
++++ b/aapl/avlcommon.h
+@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 		}
+ 
+ #ifdef AVL_BASIC
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ #else
+-		keyRelation = compare( element->BASEKEY(getKey()), 
++		keyRelation = this->compare( element->BASEKEY(getKey()),
+ 				curEl->BASEKEY(getKey()) );
+ #endif
+ 
+@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare(key, curEl->getKey());
++		keyRelation = this->compare(key, curEl->getKey());
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+diff --git a/aapl/bstcommon.h b/aapl/bstcommon.h
+index 888717f..7c53ff3 100644
+--- a/aapl/bstcommon.h
++++ b/aapl/bstcommon.h
+@@ -361,7 +361,7 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
+ 
+ 			lower = mid - 1;
+ 			while ( lower != lowEnd && 
+-					compare(key, GET_KEY(*lower)) == 0 )
++					this->compare(key, GET_KEY(*lower)) == 0 )
+ 				lower--;
+ 
+ 			upper = mid + 1;
+ 			while ( upper != highEnd && 
+-					compare(key, GET_KEY(*upper)) == 0 )
++					this->compare(key, GET_KEY(*upper)) == 0 )
+ 				upper++;
+ 			
+ 			low = (Element*)lower + 1;
+@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+diff --git a/aapl/bubblesort.h b/aapl/bubblesort.h
+index bcc2fb6..f0f4ce5 100644
+--- a/aapl/bubblesort.h
++++ b/aapl/bubblesort.h
+@@ -72,7 +72,7 @@ template <class T, class Compare> void BubbleSort<T,Compare>::
+ 		changed = false;
+ 		for ( long i = 0; i < len-pass; i++ ) {
+ 			/* Do we swap pos with the next one? */
+-			if ( compare( data[i], data[i+1] ) > 0 ) {
++			if ( this->compare( data[i], data[i+1] ) > 0 ) {
+ 				char tmp[sizeof(T)];
+ 
+ 				/* Swap the two items. */
+diff --git a/aapl/mergesort.h b/aapl/mergesort.h
+index 68b8426..8cefa73 100644
+--- a/aapl/mergesort.h
++++ b/aapl/mergesort.h
+@@ -110,7 +110,7 @@ template< class T, class Compare> void MergeSort<T,Compare>::
+ 		}
+ 		else {
+ 			/* Both upper and lower left. */
+-			if ( compare(*lower, *upper) <= 0 )
++			if ( this->compare(*lower, *upper) <= 0 )
+ 				memcpy( dest++, lower++, sizeof(T) );
+ 			else
+ 				memcpy( dest++, upper++, sizeof(T) );
+-- 
+1.7.8.6
+
diff --git a/dev-util/kelbt/kelbt-0.15.ebuild b/dev-util/kelbt/kelbt-0.15.ebuild
index c19345568469..f9b93cf8ae8f 100644
--- a/dev-util/kelbt/kelbt-0.15.ebuild
+++ b/dev-util/kelbt/kelbt-0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kelbt/kelbt-0.15.ebuild,v 1.1 2012/05/22 23:46:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kelbt/kelbt-0.15.ebuild,v 1.2 2012/06/24 07:56:56 flameeyes Exp $
 
 EAPI=4
 
@@ -21,10 +21,12 @@ src_prepare() {
 	find "${S}" -iname "Makefile*" -exec sed -i \
 		-e '/\$(CXX)/s:CFLAGS:CXXFLAGS:' \
 		{} \;
+
+	epatch "${FILESDIR}"/ragel-6.7+gcc-4.7.patch
 }
 
 src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die
+	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_test() {
@@ -33,11 +35,11 @@ src_test() {
 }
 
 src_install() {
-	dobin kelbt/kelbt || die
-	dodoc TODO CREDITS ChangeLog || die
+	dobin kelbt/kelbt
+	dodoc TODO CREDITS ChangeLog
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins ${PN}.vim || die
+		doins ${PN}.vim
 	fi
 }