adjusted ebuild to follow eclass reorg

Package-Manager: portage-2.1.3.9

3 files changed, 24 insertions, 22 deletions

diff --git a/dev-ada/glade/ChangeLog b/dev-ada/glade/ChangeLog
index 6c6af47ae0d4..79c4c7af10a5 100644
--- a/dev-ada/glade/ChangeLog
+++ b/dev-ada/glade/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ada/glade
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/glade/ChangeLog,v 1.1 2007/02/05 10:35:15 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/glade/ChangeLog,v 1.2 2007/09/25 13:11:41 george Exp $
+
+  25 Sep 2007; George Shapovalov <george@gentoo.org> glade-2006.0.ebuild:
+  adjusted ebuild to follow eclass reorg, gnat_src_unpack was factored out
 
 *glade-2006.0 (05 Feb 2007)
 
diff --git a/dev-ada/glade/Manifest b/dev-ada/glade/Manifest
index 9de6038f2536..fdf08add12d7 100644
--- a/dev-ada/glade/Manifest
+++ b/dev-ada/glade/Manifest
@@ -1,12 +1,12 @@
 DIST glade-2006.0.tar.bz2 393969 RMD160 478e8082febce36d0997e76c793d534b3789ee65 SHA1 378c97b2db45de633b0bc462f48ae73fad4b89c7 SHA256 0a0ef4b7aeb426b4b298b38fcdb9d7236b56a9c5aa6d16c24745450587b6ef85
-EBUILD glade-2006.0.ebuild 2303 RMD160 89ea024a5ccb7f1c1111edb0eb4c64a8af329ed4 SHA1 87ca2b80a875904db14818d7db549b9725ed2c80 SHA256 74f3c068a544abbce6661b4ec5f1892c5e20ea7024e7b8c50e97227b97d0b97c
-MD5 b2f340c0ee5a78efaf1ee5dedb12ab47 glade-2006.0.ebuild 2303
-RMD160 89ea024a5ccb7f1c1111edb0eb4c64a8af329ed4 glade-2006.0.ebuild 2303
-SHA256 74f3c068a544abbce6661b4ec5f1892c5e20ea7024e7b8c50e97227b97d0b97c glade-2006.0.ebuild 2303
-MISC ChangeLog 338 RMD160 92f4fd2270c4c17fbbaf4625f7da093b7926ed79 SHA1 92addb07bcff31697d7bcd4dea9c3e859a2c613b SHA256 5854c2788f0dc4020a31067923d302786ca218953c1860a438f41f042c16becf
-MD5 ddc016452da26851bdfe7c64ef3d4382 ChangeLog 338
-RMD160 92f4fd2270c4c17fbbaf4625f7da093b7926ed79 ChangeLog 338
-SHA256 5854c2788f0dc4020a31067923d302786ca218953c1860a438f41f042c16becf ChangeLog 338
+EBUILD glade-2006.0.ebuild 2390 RMD160 6b8422075a659c24c2b320a70fb259b137d95340 SHA1 60e0b9e2a66dccc69b0add8e278373bc9dc4eed3 SHA256 18ad370f14864cb6fb06bec7578af3ce3b028b4b2f7233f884c397e77dd5ceb9
+MD5 1a3cc9661c6ccd35fd0f1d1c9c2207fe glade-2006.0.ebuild 2390
+RMD160 6b8422075a659c24c2b320a70fb259b137d95340 glade-2006.0.ebuild 2390
+SHA256 18ad370f14864cb6fb06bec7578af3ce3b028b4b2f7233f884c397e77dd5ceb9 glade-2006.0.ebuild 2390
+MISC ChangeLog 488 RMD160 ad1818de7a7b8b8c485e2e84875551fa3fd69394 SHA1 5e1a910e2fad1be7848947d9496c45a660862156 SHA256 b858349b9d9c598eac4c1de3bb17302ece4cdcf7e2529f22b4c2923f8ae016a4
+MD5 46c3e416651d3f6b17bf9304e084694f ChangeLog 488
+RMD160 ad1818de7a7b8b8c485e2e84875551fa3fd69394 ChangeLog 488
+SHA256 b858349b9d9c598eac4c1de3bb17302ece4cdcf7e2529f22b4c2923f8ae016a4 ChangeLog 488
 MISC metadata.xml 156 RMD160 176ce2ddfa15a21eb2b752633f3514cc3640749e SHA1 de9b70211ac77fb8e22706d4e968b04a634f65f2 SHA256 34f8bec858b5da24b0fc4d703932bf225d4ee545f13cc253e42d8bc84956dbec
 MD5 e8e274a5057d2f205a38206204250c79 metadata.xml 156
 RMD160 176ce2ddfa15a21eb2b752633f3514cc3640749e metadata.xml 156
diff --git a/dev-ada/glade/glade-2006.0.ebuild b/dev-ada/glade/glade-2006.0.ebuild
index 7ad51a9b1eb3..c1d9750ec687 100644
--- a/dev-ada/glade/glade-2006.0.ebuild
+++ b/dev-ada/glade/glade-2006.0.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/dev-ada/glade/glade-2006.0.ebuild,v 1.2 2007/02/27 14:30:36 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/glade/glade-2006.0.ebuild,v 1.3 2007/09/25 13:11:41 george Exp $
 
 inherit gnat
 
@@ -20,9 +20,9 @@ DEPEND="virtual/gnat"
 DN="${WORKDIR}/LocalD"
 
 src_unpack() {
-	gnat_src_unpack
+	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	# configure performs some stupid check and in a wrong way, we will surely
 	# have a modern enough gnat
 	sed -i -e "s:-le \"\$am_gnatls_date\":-le \"20040909\":" configure
@@ -38,14 +38,13 @@ lib_compile()
 # NOTE: we are using $1 - the passed gnat profile name
 lib_install()
 {
-	# ATTN!
-	# get_gnat_value relies on having a value specific for gnat in the first
-	# position of a requested env var. Above works for PATH because gnat.eclass
-	# prepends values from the freshly activated gnat profile!
-	#
-	# Also, we install directly to ${D} here, as this is really a part of gnat
-	make prefix=${DN} \
-		bindir=${DN}/$(get_gnat_value PATH) \
+	# This package expands the libs and sources rovided by compiler. Therefore
+	# we install in yet another local location, to bypass gnat's automation.
+	# The compiler specific stuf is then moved to ${D} directly.  Not ideal, as
+	# this hook is called from within src_compile, but alternatives are more
+	# complex. The next version should probably be done mirroring the asis-xxx.
+	make prefix="${DN}" \
+		bindir="${DN}"/$(get_gnat_value PATH) \
 		install || die "make install failed"
 	#
 	# Makefile does not seem to accept much more than bindir, so the rest we
@@ -69,10 +68,10 @@ src_install ()
 	gnat_src_install
 
 	# clean empty dirs
-	rm -rf ${D}/usr/share/gnat/ ${D}/usr/lib/ada/
+	rm -rf "${D}"/usr/share/gnat/ "${D}"/usr/lib/ada/
 
 	# move prepared stuff over
-	cp -rp "${DN}"/* ${D}
+	cp -rp "${DN}"/* "${D}"
 	dodoc COPYING README NEWS
 	insinto /usr/share/doc/${PF}
 	doins -r  Examples/