[gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass

[George Shapovalov (george)]

george      08/04/14 14:54:22

  Modified:             gnatbuild.eclass
  Log:
  changed pkg_postrm to automatically deactivate unmerged gnat profile

Revision  Changes    Path
1.39                 eclass/gnatbuild.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.38&r2=1.39

Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnatbuild.eclass	12 Apr 2008 07:47:00 -0000	1.38
+++ gnatbuild.eclass	14 Apr 2008 14:54:21 -0000	1.39
@@ -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/eclass/gnatbuild.eclass,v 1.38 2008/04/12 07:47:00 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.39 2008/04/14 14:54:21 george Exp $
 #
 # Author: George Shapovalov <george@g.o>
 # Belongs to: ada herd <ada@g.o>
@@ -200,9 +200,7 @@
 	curr_config=$(eselect --no-color gnat show | grep ${CTARGET} | awk '{ print $1 }') || return 0
 	[[ -z ${curr_config} ]] && return 0
 
-	# extraction of profile prats and all the relevant logic of toolchain.eclass
-	# is contained  here in SLOT and PN vars. The answer basically is, whether
-	# we have the same profile. A new one should not be enacted
+	# The logic is basically "try to keep the same profile if possible"
 
 	if [[ ${curr_config} == ${CTARGET}-${PN}-${SLOT} ]] ; then
 		return 0
@@ -285,6 +283,8 @@
 gnatbuild_pkg_postinst() {
 	if should_we_eselect_gnat; then
 		do_gnat_config
+	else
+		eselect gnat update
 	fi
 
 	# if primary compiler list is empty, add this profile to the list, so
@@ -302,10 +302,12 @@
 
 
 gnatbuild_pkg_postrm() {
-	elog "If you are removing the last version of gnat in this SLOT, please manually run:"
-	elog "   rm /etc/env.d/55gnat-*"
-	elog "(running this automatically from every pgk_postrm will break"
-	elog "configuration in case an update was performed)."
+	# "eselect gnat update" now removes the env.d file if the corresponding 
+	# gnat profile was unmerged
+	eselect gnat update
+	elog "If you just unmerged the last gnat in this SLOT, your active gnat"
+	elog "profile got unset. Please check what eselect gnat show tells you"
+	elog "and set the desired profile"
 }
 #---->> pkg_* <<----
 



-- 
gentoo-commits@l.g.o mailing list