[gentoo-commits] gentoo-x86 commit in dev-ada/glade: ChangeLog glade-2006.0.ebuild

["George Shapovalov (george)" <george@gentoo.org>]

george      09/03/26 11:55:54

  Modified:             ChangeLog glade-2006.0.ebuild
  Log:
  fixed collisions (#250064)
  (Portage version: 2.2_rc27/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  dev-ada/glade/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ada/glade/ChangeLog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ada/glade/ChangeLog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ada/glade/ChangeLog?r1=1.4&r2=1.5

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ada/glade/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog	26 Mar 2009 10:05:49 -0000	1.4
+++ ChangeLog	26 Mar 2009 11:55:54 -0000	1.5
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ada/glade
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/glade/ChangeLog,v 1.4 2009/03/26 10:05:49 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/glade/ChangeLog,v 1.5 2009/03/26 11:55:54 george Exp $
+
+  26 Mar 2009; George Shapovalov <george@gentoo.org> glade-2006.0.ebuild:
+  fixed collisions (#250064)
 
   26 Mar 2009; George Shapovalov <george@gentoo.org> glade-2006.0.ebuild:
   limited DEPEND to Ada-95 compilers (#250064)



1.6                  dev-ada/glade/glade-2006.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ada/glade/glade-2006.0.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ada/glade/glade-2006.0.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ada/glade/glade-2006.0.ebuild?r1=1.5&r2=1.6

Index: glade-2006.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ada/glade/glade-2006.0.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glade-2006.0.ebuild	26 Mar 2009 10:05:49 -0000	1.5
+++ glade-2006.0.ebuild	26 Mar 2009 11:55:54 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.5 2009/03/26 10:05:49 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/glade/glade-2006.0.ebuild,v 1.6 2009/03/26 11:55:54 george Exp $
 
 inherit gnat
 
@@ -39,7 +39,7 @@
 # NOTE: we are using $1 - the passed gnat profile name
 lib_install()
 {
-	# This package expands the libs and sources rovided by compiler. Therefore
+	# This package expands the libs and sources provided 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
@@ -58,6 +58,16 @@
 	mkdir -p "${DN}/${Gnat_Incdir}"
 	mv "${DN}/lib/garlic"/*.ad? "${DN}/${Gnat_Incdir}"
 	rm -rf "${DN}/lib"
+
+	# remove files already provided by compiler
+	pushd "${DN}"
+	for fn in "${Gnat_Libdir:1}"/*.ali "${Gnat_Incdir:1}"/*.ad?; do
+		#  Gnat_Lib/Incdir are global, need to remove leading /
+		if [[ -e /${fn} ]]; then
+			rm -f ${fn}
+		fi
+	done
+	popd
 }
 
 src_install ()