[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass

["Sergei Trofimovich (slyfox)" <slyfox@gentoo.org>]

slyfox      12/07/08 19:16:46

  Modified:             ChangeLog haskell-cabal.eclass
  Log:
  Allow wildcards in CABAL_CORE_LIB_GHC_PV. Guard against breakage of ghc-shipped libraries.

Revision  Changes    Path
1.338                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.338&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.338&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.337&r2=1.338

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- ChangeLog	8 Jul 2012 12:38:10 -0000	1.337
+++ ChangeLog	8 Jul 2012 19:16:46 -0000	1.338
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.337 2012/07/08 12:38:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.338 2012/07/08 19:16:46 slyfox Exp $
+
+  08 Jul 2012; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
+  Allow wildcards in CABAL_CORE_LIB_GHC_PV. Guard against breakage of
+  ghc-shipped libraries.
 
   08 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> ruby-ng.eclass:
   Add a function to wrap around testrb-2 as well.



1.33                 eclass/haskell-cabal.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.32&r2=1.33

Index: haskell-cabal.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- haskell-cabal.eclass	19 Apr 2012 17:33:19 -0000	1.32
+++ haskell-cabal.eclass	8 Jul 2012 19:16:46 -0000	1.33
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.32 2012/04/19 17:33:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.33 2012/07/08 19:16:46 slyfox Exp $
 
 # @ECLASS: haskell-cabal.eclass
 # @MAINTAINER:
@@ -352,7 +352,7 @@
 # You can also put a space separated list, eg CABAL_CORE_LIB_GHC_PV="6.6 6.6.1".
 cabal-is-dummy-lib() {
 	for version in ${CABAL_CORE_LIB_GHC_PV[*]}; do
-		[[ "$(ghc-version)" == "$version" ]] && return 0
+		[[ "$(ghc-version)" == ${version} ]] && return 0
 	done
 	return 1
 }
@@ -461,6 +461,25 @@
 	dodir ${ghc_confdir_with_prefix#${EPREFIX}}
 	local conf_file="${D}/$(ghc-confdir)/$(ghc-localpkgconf)"
 	[[ -e $conf_file ]] || echo '[]' > "$conf_file" || die
+
+	# make sure installed packages do not destroy ghc's
+	# bundled packages
+	local initial_pkg_db=${ROOT}/$(ghc-libdir)/package.conf.d.initial
+	if [[ -e ${initial_pkg_db} ]]; then
+		local checked_pkg
+		for checked_pkg in $(ghc-listpkg "${conf_file}")
+		do
+			local initial_pkg
+			for initial_pkg in $(ghc-listpkg "${initial_pkg_db}"); do
+				if [[ ${checked_pkg} = ${initial_pkg} ]]; then
+					eerror "Package ${checked_pkg} is shipped with $(ghc-version)."
+					eerror "Ebuild author forgot CABAL_CORE_LIB_GHC_PV entry."
+					eerror "Found in ${initial_pkg_db}."
+					die
+				fi
+			done
+		done
+	fi
 }
 
 haskell-cabal_src_install() {