| 1 |
dcoutts 07/12/13 00:52:24 |
| 2 |
|
| 3 |
Modified: wxhaskell-0.9.4.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Remove unnecessary blocker. Fix shell quoting. |
| 6 |
(Portage version: 2.1.3.19) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.13 dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild?rev=1.13&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild?rev=1.13&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild?r1=1.12&r2=1.13 |
| 14 |
|
| 15 |
Index: wxhaskell-0.9.4.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild,v |
| 18 |
retrieving revision 1.12 |
| 19 |
retrieving revision 1.13 |
| 20 |
diff -u -r1.12 -r1.13 |
| 21 |
--- wxhaskell-0.9.4.ebuild 31 Oct 2007 13:11:43 -0000 1.12 |
| 22 |
+++ wxhaskell-0.9.4.ebuild 13 Dec 2007 00:52:24 -0000 1.13 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild,v 1.12 2007/10/31 13:11:43 dcoutts Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild,v 1.13 2007/12/13 00:52:24 dcoutts Exp $ |
| 28 |
|
| 29 |
inherit flag-o-matic wxwidgets ghc-package multilib |
| 30 |
|
| 31 |
@@ -14,7 +14,6 @@ |
| 32 |
IUSE="doc" |
| 33 |
|
| 34 |
RDEPEND="<dev-lang/ghc-6.6 |
| 35 |
- !>=dev-lang/ghc-6.6 |
| 36 |
=x11-libs/wxGTK-2.6*" |
| 37 |
|
| 38 |
DEPEND="${RDEPEND} |
| 39 |
@@ -38,12 +37,12 @@ |
| 40 |
src_unpack() { |
| 41 |
unpack ${A} |
| 42 |
# adapt to Gentoo path convention |
| 43 |
- sed -i 's:/doc/html:/share/doc/html:' ${S}/configure |
| 44 |
+ sed -i 's:/doc/html:/share/doc/html:' "${S}/configure" |
| 45 |
# fix superfluous dependencies on hslibs packages |
| 46 |
sed -i -e 's:,lang::' -e 's:,"lang"::' \ |
| 47 |
- -e 's:,concurrent::' -e 's:,"concurrent"::' ${S}/configure |
| 48 |
+ -e 's:,concurrent::' -e 's:,"concurrent"::' "${S}/configure" |
| 49 |
# fix Makefile to respect CXXFLAGS |
| 50 |
- sed -i 's:^\(WXC-CXXFLAGS.*=\):\1\$(CXXFLAGS) :' ${S}/makefile |
| 51 |
+ sed -i 's:^\(WXC-CXXFLAGS.*=\):\1\$(CXXFLAGS) :' "${S}/makefile" |
| 52 |
} |
| 53 |
|
| 54 |
src_compile() { |
| 55 |
@@ -64,7 +63,7 @@ |
| 56 |
--prefix=/usr \ |
| 57 |
--with-opengl \ |
| 58 |
--libdir=/usr/$(get_libdir)/${P} \ |
| 59 |
- --package-conf=${S}/$(ghc-localpkgconf) \ |
| 60 |
+ --package-conf="${S}/$(ghc-localpkgconf)" \ |
| 61 |
|| die "./configure failed" |
| 62 |
|
| 63 |
emake -j1 || die "make failed" |
| 64 |
@@ -82,21 +81,21 @@ |
| 65 |
emake -j1 install-files DESTDIR="${D}" || die "make install failed" |
| 66 |
|
| 67 |
# the .so needs to be on the lib path |
| 68 |
- mkdir -p ${D}/usr/$(get_libdir) |
| 69 |
- for f in ${D}/usr/$(get_libdir)/${P}/libwxc-*.so; do |
| 70 |
- mv ${f} ${D}/usr/$(get_libdir)/ |
| 71 |
+ mkdir -p "${D}/usr/$(get_libdir)" |
| 72 |
+ for f in "${D}/usr/$(get_libdir)/${P}/"libwxc-*.so; do |
| 73 |
+ mv ${f} "${D}/usr/$(get_libdir)/" |
| 74 |
done |
| 75 |
|
| 76 |
if use doc; then |
| 77 |
dohtml -A haddock -r out/doc/* |
| 78 |
- cp -r samples ${D}/usr/share/doc/${PF} |
| 79 |
+ cp -r samples "${D}/usr/share/doc/${PF}" |
| 80 |
fi |
| 81 |
|
| 82 |
# substitute for the ${wxhlibdir} in package files and register them |
| 83 |
# for ghc-6.2 change the package to be exposed by default. |
| 84 |
sed -i -e "s:\${wxhlibdir}:${D}/usr/$(get_libdir)/${P}:" \ |
| 85 |
-e "s:auto = False:auto = True:" \ |
| 86 |
- ${D}/usr/$(get_libdir)/${P}/*.pkg |
| 87 |
- ghc-setup-pkg ${D}/usr/$(get_libdir)/${P}/*.pkg |
| 88 |
+ "${D}/usr/$(get_libdir)/${P}/"*.pkg |
| 89 |
+ ghc-setup-pkg "${D}/usr/$(get_libdir)/${P}/"*.pkg |
| 90 |
ghc-install-pkg |
| 91 |
} |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
1.28 dev-haskell/wxhaskell/ChangeLog |
| 96 |
|
| 97 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/wxhaskell/ChangeLog?rev=1.28&view=markup |
| 98 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/wxhaskell/ChangeLog?rev=1.28&content-type=text/plain |
| 99 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/wxhaskell/ChangeLog?r1=1.27&r2=1.28 |
| 100 |
|
| 101 |
Index: ChangeLog |
| 102 |
=================================================================== |
| 103 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v |
| 104 |
retrieving revision 1.27 |
| 105 |
retrieving revision 1.28 |
| 106 |
diff -u -r1.27 -r1.28 |
| 107 |
--- ChangeLog 31 Oct 2007 13:11:43 -0000 1.27 |
| 108 |
+++ ChangeLog 13 Dec 2007 00:52:24 -0000 1.28 |
| 109 |
@@ -1,6 +1,9 @@ |
| 110 |
# ChangeLog for dev-haskell/wxhaskell |
| 111 |
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 112 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.27 2007/10/31 13:11:43 dcoutts Exp $ |
| 113 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.28 2007/12/13 00:52:24 dcoutts Exp $ |
| 114 |
+ |
| 115 |
+ 13 Dec 2007; Duncan Coutts <dcoutts@g.o> wxhaskell-0.9.4.ebuild: |
| 116 |
+ Remove unnecessary blocker. |
| 117 |
|
| 118 |
31 Oct 2007; Duncan Coutts <dcoutts@g.o> wxhaskell-0.9.4.ebuild: |
| 119 |
Drop virtual/ghc in favour of dev-lang/ghc |
| 120 |
|
| 121 |
|
| 122 |
|
| 123 |
-- |
| 124 |
gentoo-commits@g.o mailing list |
Archives