| 1 |
slyfox 12/07/08 19:16:46 |
| 2 |
|
| 3 |
Modified: ChangeLog haskell-cabal.eclass |
| 4 |
Log: |
| 5 |
Allow wildcards in CABAL_CORE_LIB_GHC_PV. Guard against breakage of ghc-shipped libraries. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.338 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.338&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.338&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.337&r2=1.338 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.337 |
| 18 |
retrieving revision 1.338 |
| 19 |
diff -u -r1.337 -r1.338 |
| 20 |
--- ChangeLog 8 Jul 2012 12:38:10 -0000 1.337 |
| 21 |
+++ ChangeLog 8 Jul 2012 19:16:46 -0000 1.338 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.337 2012/07/08 12:38:10 flameeyes Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.338 2012/07/08 19:16:46 slyfox Exp $ |
| 27 |
+ |
| 28 |
+ 08 Jul 2012; Sergei Trofimovich <slyfox@g.o> haskell-cabal.eclass: |
| 29 |
+ Allow wildcards in CABAL_CORE_LIB_GHC_PV. Guard against breakage of |
| 30 |
+ ghc-shipped libraries. |
| 31 |
|
| 32 |
08 Jul 2012; Diego E. Pettenò <flameeyes@g.o> ruby-ng.eclass: |
| 33 |
Add a function to wrap around testrb-2 as well. |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.33 eclass/haskell-cabal.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.33&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.33&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.32&r2=1.33 |
| 42 |
|
| 43 |
Index: haskell-cabal.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v |
| 46 |
retrieving revision 1.32 |
| 47 |
retrieving revision 1.33 |
| 48 |
diff -u -r1.32 -r1.33 |
| 49 |
--- haskell-cabal.eclass 19 Apr 2012 17:33:19 -0000 1.32 |
| 50 |
+++ haskell-cabal.eclass 8 Jul 2012 19:16:46 -0000 1.33 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2012 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.32 2012/04/19 17:33:19 slyfox Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.33 2012/07/08 19:16:46 slyfox Exp $ |
| 56 |
|
| 57 |
# @ECLASS: haskell-cabal.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -352,7 +352,7 @@ |
| 60 |
# You can also put a space separated list, eg CABAL_CORE_LIB_GHC_PV="6.6 6.6.1". |
| 61 |
cabal-is-dummy-lib() { |
| 62 |
for version in ${CABAL_CORE_LIB_GHC_PV[*]}; do |
| 63 |
- [[ "$(ghc-version)" == "$version" ]] && return 0 |
| 64 |
+ [[ "$(ghc-version)" == ${version} ]] && return 0 |
| 65 |
done |
| 66 |
return 1 |
| 67 |
} |
| 68 |
@@ -461,6 +461,25 @@ |
| 69 |
dodir ${ghc_confdir_with_prefix#${EPREFIX}} |
| 70 |
local conf_file="${D}/$(ghc-confdir)/$(ghc-localpkgconf)" |
| 71 |
[[ -e $conf_file ]] || echo '[]' > "$conf_file" || die |
| 72 |
+ |
| 73 |
+ # make sure installed packages do not destroy ghc's |
| 74 |
+ # bundled packages |
| 75 |
+ local initial_pkg_db=${ROOT}/$(ghc-libdir)/package.conf.d.initial |
| 76 |
+ if [[ -e ${initial_pkg_db} ]]; then |
| 77 |
+ local checked_pkg |
| 78 |
+ for checked_pkg in $(ghc-listpkg "${conf_file}") |
| 79 |
+ do |
| 80 |
+ local initial_pkg |
| 81 |
+ for initial_pkg in $(ghc-listpkg "${initial_pkg_db}"); do |
| 82 |
+ if [[ ${checked_pkg} = ${initial_pkg} ]]; then |
| 83 |
+ eerror "Package ${checked_pkg} is shipped with $(ghc-version)." |
| 84 |
+ eerror "Ebuild author forgot CABAL_CORE_LIB_GHC_PV entry." |
| 85 |
+ eerror "Found in ${initial_pkg_db}." |
| 86 |
+ die |
| 87 |
+ fi |
| 88 |
+ done |
| 89 |
+ done |
| 90 |
+ fi |
| 91 |
} |
| 92 |
|
| 93 |
haskell-cabal_src_install() { |
Archives