repackaged the sources for 3.4.6.2006 and simplified the ebuild

Package-Manager: portage-2.1.1_rc1-r7

4 files changed, 33 insertions, 44 deletions

diff --git a/dev-ada/asis/ChangeLog b/dev-ada/asis/ChangeLog
index 5dfe4047e7f8..b1a4527cce2e 100644
--- a/dev-ada/asis/ChangeLog
+++ b/dev-ada/asis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ada/asis
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/ChangeLog,v 1.22 2006/09/09 21:27:48 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/ChangeLog,v 1.23 2006/09/09 21:46:08 george Exp $
+
+  09 Sep 2006; George Shapovalov <george@gentoo.org> asis-3.4.6.2006.ebuild:
+  repackaged the sources for 3.4.6.2006 and simplified the ebuild
 
 *asis-3.4.6 (09 Sep 2006)
 
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index c24b4de430ae..66756b5f68a0 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -5,15 +5,15 @@ SHA256 3518f6213d7e8be35be074a1529bb2a0b020f7667c8dcced51cac05678ccbfab files/as
 DIST asis-3.15p-src.tgz 1401350
 DIST asis-3.4.4.tar.bz2 2874938 RMD160 ec6acf720c4fb6a386fa6da8de40f88b5b9f310d SHA1 949725a605ffa92e30cdc53b397483d38078a90c SHA256 2d3546d04839801ef617005e60ee24be9a0004f8481c70e3ea51a17443d094d5
 DIST asis-3_4_4-20041123.src.tar.gz 3538230 RMD160 13fc07c1ffdaa2f32455f559d092c0f69fa2e65e SHA1 8d8cc64b2895dbb85ac7bfdd8dffcc95be5ed76e SHA256 2a96be349342d1452fef34ad13f7aefce0e3b0dbca52106b99253e6a1b6ec47d
-DIST asis-gpl-2006-src.tgz 2118559 RMD160 e1ea4792f2a1ff34762f5362054f9560528d9629 SHA1 0e1b290fa6065cbb87d71b2a4e1a206e765f66e8 SHA256 61838a94b19bd8a132c6053ee691ab51b39a54fd1bd10c98d9a10efd63663e2d
+DIST asis-gpl-2006.tar.bz2 1546623 RMD160 98dbf455cb45a9cd2352b01d624cae5153b9b881 SHA1 6bd02da83d8c1eede5dd9f038cbcf436201f4d70 SHA256 66825814792b1ddce9a6e3cc43c7426f9a563d9dbaa1b254884139b51279ebf4
 EBUILD asis-3.15p.ebuild 2966 RMD160 80dbe5371880f40d9b9647dea9f45e0494870250 SHA1 eabec8946f02ec99957734f42e9718112ba28eb0 SHA256 2011683c910ab70152498fe6b93952eb3231caa52900005bb2e4f98dc670fa2f
 MD5 c8356886261b78e511b42b58f2fd3650 asis-3.15p.ebuild 2966
 RMD160 80dbe5371880f40d9b9647dea9f45e0494870250 asis-3.15p.ebuild 2966
 SHA256 2011683c910ab70152498fe6b93952eb3231caa52900005bb2e4f98dc670fa2f asis-3.15p.ebuild 2966
-EBUILD asis-3.4.6.2006.ebuild 3822 RMD160 3c54a1db116b5560b56f17672e6e2f4b8cb086a3 SHA1 60050162caa7639e54e4cd01530e4286551433af SHA256 a15f398b4a7adaef0461883b3dea97cd1a3ad93c97f0102ab302ddd51fed49fe
-MD5 4c856d171472c5669669c66f6fb29b75 asis-3.4.6.2006.ebuild 3822
-RMD160 3c54a1db116b5560b56f17672e6e2f4b8cb086a3 asis-3.4.6.2006.ebuild 3822
-SHA256 a15f398b4a7adaef0461883b3dea97cd1a3ad93c97f0102ab302ddd51fed49fe asis-3.4.6.2006.ebuild 3822
+EBUILD asis-3.4.6.2006.ebuild 3333 RMD160 280f5f1cd8f3396d5dd6ce9f4b897f1198d73bc1 SHA1 8c23218b4bfb41bff138e8adf66b8bc2cc726444 SHA256 1ea8b420bab8b6131c1c16ee03e8ed45fe1dc26e03f19adc0c9e6bb2cb6046c5
+MD5 5004fce067f4701c49643ed3766ba349 asis-3.4.6.2006.ebuild 3333
+RMD160 280f5f1cd8f3396d5dd6ce9f4b897f1198d73bc1 asis-3.4.6.2006.ebuild 3333
+SHA256 1ea8b420bab8b6131c1c16ee03e8ed45fe1dc26e03f19adc0c9e6bb2cb6046c5 asis-3.4.6.2006.ebuild 3333
 EBUILD asis-3.4.6.ebuild 4842 RMD160 758cd6937b7e1bebe5c8d94d081abbe4cc373d77 SHA1 c251e5fbaf1d0035c9ba162ae778eadd4b1026b8 SHA256 65ebbaa3f75701c7b8e6baaa9b70e23eb5dbd40c5cb19d96deb639c64c723e21
 MD5 fc0b9edc08f33a26f3514b455607729f asis-3.4.6.ebuild 4842
 RMD160 758cd6937b7e1bebe5c8d94d081abbe4cc373d77 asis-3.4.6.ebuild 4842
@@ -22,10 +22,10 @@ EBUILD asis-3.44.ebuild 3486 RMD160 a317cbfcb6eb15e1b05c24a1e84ffc67ac3bdd97 SHA
 MD5 8c27264b6c7dcc213596aa8f81986698 asis-3.44.ebuild 3486
 RMD160 a317cbfcb6eb15e1b05c24a1e84ffc67ac3bdd97 asis-3.44.ebuild 3486
 SHA256 e0faf35f549bd5dca5125cfa5f0043e9ac14d483baa12bf35e985231a092a916 asis-3.44.ebuild 3486
-MISC ChangeLog 3372 RMD160 5fe8e4c904ebe4c88b5b81e579a849728e509490 SHA1 e4f2e95ff5a310c60d64c91d1a539325641edb87 SHA256 ed1c5ef10aecbabc35328a54684a2851d7f8d55ec6dfa989000d71de9d72dad6
-MD5 2992b7620340bf69c2639a5e47d862fa ChangeLog 3372
-RMD160 5fe8e4c904ebe4c88b5b81e579a849728e509490 ChangeLog 3372
-SHA256 ed1c5ef10aecbabc35328a54684a2851d7f8d55ec6dfa989000d71de9d72dad6 ChangeLog 3372
+MISC ChangeLog 3516 RMD160 1b90d3e14561937e6ddb170d6e63099d0ef595e0 SHA1 bd18b22615b3e881f660194996678ba994eba8de SHA256 1f39e92e4806c175842560290e716fa48cfe87264170e80afc78b7b5806a5c33
+MD5 808c37fd68e4d04493c4fa055eed783f ChangeLog 3516
+RMD160 1b90d3e14561937e6ddb170d6e63099d0ef595e0 ChangeLog 3516
+SHA256 1f39e92e4806c175842560290e716fa48cfe87264170e80afc78b7b5806a5c33 ChangeLog 3516
 MISC metadata.xml 598 RMD160 b82487ff514ca323ee57a15a0294b080c27f7b9c SHA1 30f217811a04e04864d93875a3eb26513c272e7f SHA256 f03c69e689b212b787e27a7bac12bbeeb37fe252be75eff4366f86027aeb4e14
 MD5 fd7e5cf25ef3dec8ef610126f059f680 metadata.xml 598
 RMD160 b82487ff514ca323ee57a15a0294b080c27f7b9c metadata.xml 598
@@ -36,9 +36,9 @@ SHA256 fcbc46c823920ec6a5023ef5680fbf1c6f9e5d17f7e1451fdc138ae477fde371 files/di
 MD5 d6570d957225c61b625302b23a6a44b6 files/digest-asis-3.4.6 238
 RMD160 173952181a338184dcb15259497d8bb172be3611 files/digest-asis-3.4.6 238
 SHA256 7d0785d9760aec7fe31d9009751fce46751031491cc42ec75b65075becb20a77 files/digest-asis-3.4.6 238
-MD5 0aa12f35149939dc601cbf3ea3eb884d files/digest-asis-3.4.6.2006 247
-RMD160 27aef3ce7d444261743136fb566f2545c92f4b16 files/digest-asis-3.4.6.2006 247
-SHA256 7dde94a939e2c6329a5e79ef17ccb59d396e1e0edb200bf7e6248ee37d79ff5d files/digest-asis-3.4.6.2006 247
+MD5 a73ee5d92b8be8d896d08328577f1938 files/digest-asis-3.4.6.2006 247
+RMD160 c600e315776203e4a1aa2c101b35de4c1be59be9 files/digest-asis-3.4.6.2006 247
+SHA256 67d8d19783505598c35f3988b9fd707c6d0ad6b693d21ac319767344770dfb09 files/digest-asis-3.4.6.2006 247
 MD5 e4ed0ce41f3aeb7e5b55cc532a7be07a files/digest-asis-3.44 274
 RMD160 5702e653af9cd3e20ac569ff6191f5cd526e9853 files/digest-asis-3.44 274
 SHA256 c971ec408a3eb3df3bb0bbf1291cc6442aa249a1482d97c350708cdb4e310de3 files/digest-asis-3.44 274
diff --git a/dev-ada/asis/asis-3.4.6.2006.ebuild b/dev-ada/asis/asis-3.4.6.2006.ebuild
index 52adeec6913d..69a5375520e4 100644
--- a/dev-ada/asis/asis-3.4.6.2006.ebuild
+++ b/dev-ada/asis/asis-3.4.6.2006.ebuild
@@ -1,25 +1,18 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/asis-3.4.6.2006.ebuild,v 1.2 2006/09/08 16:34:51 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/asis-3.4.6.2006.ebuild,v 1.3 2006/09/09 21:46:08 george Exp $
 
 inherit eutils flag-o-matic gnatbuild
 
 ACT_Ver=$(get_version_component_range 4)
 Gnat_Name="gnat-gpl"
 
-S="${WORKDIR}/asis-${ACT_Ver}-src"
 DESCRIPTION="The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)"
-SRC_URI="http://dev.gentoo.org/~george/src/asis-gpl-${ACT_Ver}-src.tgz"
-
+SRC_URI="http://dev.gentoo.org/~george/src/asis-gpl-${ACT_Ver}.tar.bz2"
 HOMEPAGE="https://libre2.adacore.com/"
-
 LICENSE="GPL-2"
 
-IUSE="doc"
-RDEPEND="=dev-lang/gnat-gpl-${PV}*"
-DEPEND="${RDEPEND}
-	doc? ( virtual/tetex
-	app-text/texi2html )"
+KEYWORDS="~amd64 ~x86"
 
 # saving slot as defined in gnatbuild.eclass
 eSLOT=${SLOT}
@@ -28,8 +21,14 @@ eSLOT=${SLOT}
 # eSLOT depends only on PV, so it is really static
 SLOT="ACT-${eSLOT}"
 
-KEYWORDS="~amd64 ~x86"
-#IUSE="doc"
+
+IUSE="doc"
+RDEPEND="=dev-lang/gnat-gpl-${PV}*"
+DEPEND="${RDEPEND}
+	doc? ( virtual/tetex
+	app-text/texi2html )"
+
+S="${WORKDIR}/asis-${ACT_Ver}"
 
 # it may be even better to force plain -O2 -pipe -ftracer here
 replace-flags -O3 -O2
@@ -51,16 +50,6 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}
-	sed -i -e "s:\"gcc\":\"gnatgcc\":" asis/a4g-contt.adb
-	sed -i -e "s:\"gcc\":\"gnatgcc\":" \
-		-e "s:environment settings for gcc:environment for gnatgcc:" \
-		asis/a4g-gnat_int.adb
-	sed -i -e "s:\"gcc#\":\"gnatgcc#\":" gnat/snames.adb
-
-	sed -i -e "s:gcc:gnatgcc:" tools/tool_utils/asis_ul-common.adb
-	sed -i -e "s:\"gcc:\"gnatgcc:" tools/gnatmetric/metrics-compute.adb
 }
 
 
@@ -98,14 +87,11 @@ src_install () {
 	chmod 0755 obj/libasis-${ACT_Ver}.so
 	cp obj/libasis-${ACT_Ver}.so ${D}${LIBPATH}/adalib
 	insinto ${LIBPATH}/adalib
-	doins obj/*.ali
-	chmod 0644 lib/libasis.a
-	newins lib/libasis.a libasis-${ACT_Ver}.a
+	doins obj/*.ali lib/libasis.a
 	# make appropriate symlinks
-	cd ${D}${LIBPATH}/adalib
+	pushd ${D}${LIBPATH}/adalib
 	ln -s libasis-${ACT_Ver}.so libasis.so
-	ln -s libasis-${ACT_Ver}.a libasis.a
-	cd ${S}
+	popd
 	# sources
 	insinto ${LIBPATH}/adainclude
 	doins gnat/*.ad[sb]
diff --git a/dev-ada/asis/files/digest-asis-3.4.6.2006 b/dev-ada/asis/files/digest-asis-3.4.6.2006
index b133ac0d47ab..bb02f4c62c70 100644
--- a/dev-ada/asis/files/digest-asis-3.4.6.2006
+++ b/dev-ada/asis/files/digest-asis-3.4.6.2006
@@ -1,3 +1,3 @@
-MD5 f415da57e567ee77e55ba192bf40a954 asis-gpl-2006-src.tgz 2118559
-RMD160 e1ea4792f2a1ff34762f5362054f9560528d9629 asis-gpl-2006-src.tgz 2118559
-SHA256 61838a94b19bd8a132c6053ee691ab51b39a54fd1bd10c98d9a10efd63663e2d asis-gpl-2006-src.tgz 2118559
+MD5 719dd1bd298eea42b2947edda58951eb asis-gpl-2006.tar.bz2 1546623
+RMD160 98dbf455cb45a9cd2352b01d624cae5153b9b881 asis-gpl-2006.tar.bz2 1546623
+SHA256 66825814792b1ddce9a6e3cc43c7426f9a563d9dbaa1b254884139b51279ebf4 asis-gpl-2006.tar.bz2 1546623