redid the big patch since the original one was complaining a lot and even asking questions with new eclass

(Portage version: 2.1_pre6-r5)

4 files changed, 18 insertions, 9 deletions

diff --git a/dev-lang/gnat-gpl/ChangeLog b/dev-lang/gnat-gpl/ChangeLog
index 24e31e62116d..faa7d24262dd 100644
--- a/dev-lang/gnat-gpl/ChangeLog
+++ b/dev-lang/gnat-gpl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/gnat-gpl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gpl/ChangeLog,v 1.5 2006/03/27 10:46:02 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gpl/ChangeLog,v 1.6 2006/03/27 15:06:42 george Exp $
+
+  27 Mar 2006; George Shapovalov <george@gentoo.org>
+  gnat-gpl-3.4.5.1-r2.ebuild:
+  redid the big patch since the original one was complaining a lot and even
+  asking questions with new eclass
 
   27 Mar 2006; George Shapovalov <george@gentoo.org>
   -gnat-gpl-3.4.5.1.ebuild:
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index ef2fff2534f6..b22f103950bb 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -4,9 +4,9 @@ SHA256 9a5f40512f1a1886a9a03560e2ec77f5c1253d3e7f36a80845d9da5a8149d292 ChangeLo
 MD5 f28d95fa6e19dc594ed1bfafe4795b3c files/digest-gnat-gpl-3.4.5.1-r1 354
 RMD160 d6584f35c0fc6096f934211f94d79a5ce9e32dcc files/digest-gnat-gpl-3.4.5.1-r1 354
 SHA256 e1742c6bfd303ef996228a99bea9b31908e113e3517cc1303575a497b9091590 files/digest-gnat-gpl-3.4.5.1-r1 354
-MD5 78531aa1e410b379a63633ea46d6dfaf files/digest-gnat-gpl-3.4.5.1-r2 1283
-RMD160 3bd4b25c8aa4cc87281a7173675fb9eaeba14033 files/digest-gnat-gpl-3.4.5.1-r2 1283
-SHA256 258b5ce48de1e17ecdbb5829325b8425f791c13a6c73b4b5bf8b518088cbdad3 files/digest-gnat-gpl-3.4.5.1-r2 1283
+MD5 dff835dca97b572bc06a23ff19cf8efc files/digest-gnat-gpl-3.4.5.1-r2 1536
+RMD160 61a41e2e1424eecf7d2b9e307278d67e05998303 files/digest-gnat-gpl-3.4.5.1-r2 1536
+SHA256 7c6e0b97d2ff2f539401893619c0a13daac6ed4ff4b9d88ba454fec22c60b1ec files/digest-gnat-gpl-3.4.5.1-r2 1536
 MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/gcc-configure-LANG.patch 1686
 RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/gcc-configure-LANG.patch 1686
 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/gcc-configure-LANG.patch 1686
@@ -22,9 +22,9 @@ SHA256 64772b8d84f82194bd8be91f6cf73d868b6ac24c41a5eddd238d559dbe109362 files/pa
 MD5 101628a2171a4c650021c6e2c50e5886 gnat-gpl-3.4.5.1-r1.ebuild 2418
 RMD160 ccd981a95e2de9ddf9b8f258fc41d8820dba94b4 gnat-gpl-3.4.5.1-r1.ebuild 2418
 SHA256 d70d6189c70c392a8cd0ffd547a8d746e7c567014bd1285c4309245192a1c968 gnat-gpl-3.4.5.1-r1.ebuild 2418
-MD5 4b87103f111df28ea142c775cb138022 gnat-gpl-3.4.5.1-r2.ebuild 2418
-RMD160 e23a08fca2b600893b9451b228591b0d3217d73b gnat-gpl-3.4.5.1-r2.ebuild 2418
-SHA256 e6ae55d5935c5f642f452a314628f8fde116516afe8080f08804a085b6f6c342 gnat-gpl-3.4.5.1-r2.ebuild 2418
+MD5 ea7c6396d887a5f49c54962720b7990a gnat-gpl-3.4.5.1-r2.ebuild 2372
+RMD160 f45ca4243e00492756b46d0bc3b45543f6bbfd05 gnat-gpl-3.4.5.1-r2.ebuild 2372
+SHA256 e6b1117922a92d4e1f3270d87a958547e8b9497c099d065520d04d68b7e2b835 gnat-gpl-3.4.5.1-r2.ebuild 2372
 MD5 63fe50d3f9c3d288e7c1d1ac98eac6d7 metadata.xml 552
 RMD160 9524b8f235d2e96967b1414cf0dfb81e7b4d7d41 metadata.xml 552
 SHA256 e90469f4de062e9432e406f068db899fec34efa03c8c505d605bab800cb54107 metadata.xml 552
diff --git a/dev-lang/gnat-gpl/files/digest-gnat-gpl-3.4.5.1-r2 b/dev-lang/gnat-gpl/files/digest-gnat-gpl-3.4.5.1-r2
index 6dfd1efc2212..a23a9733060a 100644
--- a/dev-lang/gnat-gpl/files/digest-gnat-gpl-3.4.5.1-r2
+++ b/dev-lang/gnat-gpl/files/digest-gnat-gpl-3.4.5.1-r2
@@ -7,6 +7,9 @@ SHA256 8a2824b12a1cae8b68de3be0a8fd2da14918462e6afa27c3578ccfc8ab10d0fc gcc-core
 MD5 003b8f14eeacad4e6977043232b249f9 gnat-gpl-3.4.5.1-src.tar.bz2 5057268
 RMD160 b1ff9411eb1fe3e27a4900c1e61140f81a1bc4bc gnat-gpl-3.4.5.1-src.tar.bz2 5057268
 SHA256 b831f83c879b22da735b1c759db1d576aaaf3547771d560f1cf8ed24e0284242 gnat-gpl-3.4.5.1-src.tar.bz2 5057268
+MD5 260ec2654df95de858587058d03b318f gnat-gpl-gcc-3.4.diff.bz2 76642
+RMD160 c80aa7d81ea25767b93a7c9a70b5228957e4fed8 gnat-gpl-gcc-3.4.diff.bz2 76642
+SHA256 fc90a356baf483d0aab489ce2ea8278a155f48fa84950f71360657e4bc8103d5 gnat-gpl-gcc-3.4.diff.bz2 76642
 MD5 1c6a132642a5d9b2712b62b5e52e593b gnatboot-3.4-amd64-r2.tar.bz2 12063245
 RMD160 6be578cb8938e872b39d2420c2151d4b8b574f20 gnatboot-3.4-amd64-r2.tar.bz2 12063245
 SHA256 c0c2fe91f6c38483193415690a4f90ac205e3aa9cf42ab3ab3e5d2a3ec269d8d gnatboot-3.4-amd64-r2.tar.bz2 12063245
diff --git a/dev-lang/gnat-gpl/gnat-gpl-3.4.5.1-r2.ebuild b/dev-lang/gnat-gpl/gnat-gpl-3.4.5.1-r2.ebuild
index a8076959f708..55d8680e7c0d 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-3.4.5.1-r2.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-3.4.5.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gpl/gnat-gpl-3.4.5.1-r2.ebuild,v 1.1 2006/03/27 10:28:07 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gpl/gnat-gpl-3.4.5.1-r2.ebuild,v 1.2 2006/03/27 15:06:42 george Exp $
 
 inherit gnatbuild
 
@@ -11,6 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${GCCVER}/gcc-core-${GCCVER}.tar.bz2
 	http://www.adaic.org/standards/05rm/RM-05-Html.zip
 	http://dev.gentoo.org/~george/src/${P}-src.tar.bz2
+	http://dev.gentoo.org/~george/src/${PN}-gcc-${SLOT}.diff.bz2
 	x86?   ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-i386.tar.bz2 )
 	amd64? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-amd64-r2.tar.bz2 )"
 # ${BOOT_SLOT} and ${GCCVER} are defined in gnatbuild.eclass and depend 
@@ -28,7 +29,7 @@ src_unpack() {
 	# prep gcc sources for Ada
 	mv "${GNATSOURCE}/src/ada" "${S}/gcc"
 	cd "${S}"
-	patch -p0 < "${GNATSOURCE}/src/gcc-34.dif"
+	epatch ${WORKDIR}/${PN}-gcc-${SLOT}.diff
 
 	gnatbuild_src_unpack common_prep