diff options
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/hsshellscript/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/hsshellscript/Manifest | 12 | ||||
| -rw-r--r-- | dev-haskell/hsshellscript/files/digest-hsshellscript-2.6.0 | 2 | ||||
| -rw-r--r-- | dev-haskell/hsshellscript/hsshellscript-2.6.0.ebuild | 32 |
4 files changed, 30 insertions, 22 deletions
diff --git a/dev-haskell/hsshellscript/ChangeLog b/dev-haskell/hsshellscript/ChangeLog index c6d7cd9d4c73..feaab8a54595 100644 --- a/dev-haskell/hsshellscript/ChangeLog +++ b/dev-haskell/hsshellscript/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/hsshellscript # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/ChangeLog,v 1.10 2006/03/01 19:40:43 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/ChangeLog,v 1.11 2006/04/07 21:20:49 araujo Exp $ + + 07 Apr 2006; Luis F. Araujo <araujo@gentoo.org> + hsshellscript-2.6.0.ebuild: + Fixed library locations. 01 Mar 2006; Michael Hanselmann <hansmi@gentoo.org> hsshellscript-2.6.0.ebuild: diff --git a/dev-haskell/hsshellscript/Manifest b/dev-haskell/hsshellscript/Manifest index 8a1777305a98..dd0c2e5dde86 100644 --- a/dev-haskell/hsshellscript/Manifest +++ b/dev-haskell/hsshellscript/Manifest @@ -7,18 +7,18 @@ SHA256 57217b493a9a512a1118dcbc002eed599c0d4a6962abff1cca22bfc7a9d69156 files/di MD5 e99cbf0bf1d4793de8d69765d43ded70 files/digest-hsshellscript-2.3.0 72 RMD160 9ca2c5ede3b6fd90779ca1fbcb546e105887b9d6 files/digest-hsshellscript-2.3.0 72 SHA256 38f5d5a5b2a79a1597db4405a43299267b090a5da81090c25ee72688756a0b4b files/digest-hsshellscript-2.3.0 72 -MD5 669d010e1fd7c5bb71478b2efb700fff files/digest-hsshellscript-2.6.0 71 -RMD160 f4a2ef6f24dde272da05f3d2745a3ea17a699a6c files/digest-hsshellscript-2.6.0 71 -SHA256 70b65511951746f91be722d20917b05a39a06a38cb01908b2faf7d92de6a6db7 files/digest-hsshellscript-2.6.0 71 +MD5 9848f2e60e0efc2a145cc308b07895c2 files/digest-hsshellscript-2.6.0 259 +RMD160 769ca7babe0631ff6763d30510daca134e1fca85 files/digest-hsshellscript-2.6.0 259 +SHA256 d08872c0a94aa8026e01178eb2ffad2cc0415db7d909cce6c1d33ebc3c045b9e files/digest-hsshellscript-2.6.0 259 MD5 342a987a2862d37266ce8637603dd0b1 hsshellscript-2.2.2.ebuild 1073 RMD160 4a59f3fa98db978e127c0b7d55a1e8c5b2a40d82 hsshellscript-2.2.2.ebuild 1073 SHA256 0db1482d4db6fb76e522c3044049f7c45e500035e218c15aca7f3c839216804a hsshellscript-2.2.2.ebuild 1073 MD5 d6e969e4cbfa253d8eff3155448a639a hsshellscript-2.3.0.ebuild 1072 RMD160 b010469f25625f36347ff64b9951c602f033123a hsshellscript-2.3.0.ebuild 1072 SHA256 a96d5457de9a1df482936ec07ed1bc971e2be6b8e27acbb58434c80234132ae9 hsshellscript-2.3.0.ebuild 1072 -MD5 b2e7bfcefbada9a3f69c9f4dead82ea0 hsshellscript-2.6.0.ebuild 1300 -RMD160 656f9a87ded40f1e65b163ca4580bbfa8573f10e hsshellscript-2.6.0.ebuild 1300 -SHA256 93384923163604ab44902989850d0c53fccea6093824ba2f4fc344c50a73189e hsshellscript-2.6.0.ebuild 1300 +MD5 4f497eb6a8af0f8130e3a0a0f4ea7948 hsshellscript-2.6.0.ebuild 1431 +RMD160 0e7ddbf8f90807b6b38033b1e62620418a192b0a hsshellscript-2.6.0.ebuild 1431 +SHA256 b9ae94d3024f3b64eae6abbbacc5e39afefca053239390f2b82c7dc67f859cec hsshellscript-2.6.0.ebuild 1431 MD5 3f6e26f4a44d1b5c6ff6380d989e6af6 metadata.xml 222 RMD160 b1c9360cd0375800038801fb4f1bbe8f5898fd3e metadata.xml 222 SHA256 ad870a1799e6b550fc263faba3ccc5bcdb7a68b1a5a023bff6fb2b103398ef27 metadata.xml 222 diff --git a/dev-haskell/hsshellscript/files/digest-hsshellscript-2.6.0 b/dev-haskell/hsshellscript/files/digest-hsshellscript-2.6.0 index a2630a20b761..4e9e186bd53e 100644 --- a/dev-haskell/hsshellscript/files/digest-hsshellscript-2.6.0 +++ b/dev-haskell/hsshellscript/files/digest-hsshellscript-2.6.0 @@ -1 +1,3 @@ MD5 d925c486757c67237cd9eb83a733ab12 hsshellscript-2.6.0.tar.gz 148256 +RMD160 ebdbcb055b7a26d9a39066b9e7311eb2cd4ca441 hsshellscript-2.6.0.tar.gz 148256 +SHA256 ac48a3e969cfcf7ea12d79db6698af1a88f1620af8b3008dcdd93d28612ca590 hsshellscript-2.6.0.tar.gz 148256 diff --git a/dev-haskell/hsshellscript/hsshellscript-2.6.0.ebuild b/dev-haskell/hsshellscript/hsshellscript-2.6.0.ebuild index 77ba1f9f08d3..b2ce0edd9283 100644 --- a/dev-haskell/hsshellscript/hsshellscript-2.6.0.ebuild +++ b/dev-haskell/hsshellscript/hsshellscript-2.6.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/hsshellscript-2.6.0.ebuild,v 1.3 2006/03/01 19:40:43 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/hsshellscript-2.6.0.ebuild,v 1.4 2006/04/07 21:20:49 araujo Exp $ -inherit base eutils ghc-package +inherit base eutils multilib ghc-package DESCRIPTION="A Haskell library for UNIX shell scripting tasks" HOMEPAGE="http://www.volker-wysk.de/hsshellscript/" @@ -14,34 +14,36 @@ KEYWORDS="~ppc ~x86" IUSE="" DEPEND=">=virtual/ghc-6.4 + >=dev-libs/glib-2.0 >=dev-haskell/haddock-0.6" RDEPEND="" +HSLIB="/usr/$(get_libdir)/${P}/ghc-$(ghc-version)/" + src_unpack() { base_src_unpack - cd ${S} - sed -i -e "/ghc-pkg/d" Makefile + # Don't register the package + sed -i "/ghc-pkg/d" "${S}/Makefile" + # Fix hsshellscript.cabal library path + sed -i "s:glib:glib-2.0:" "${S}/lib/hsshellscript.cabal" + sed -i "s:@DEST_LIB:${HSLIB}:" "${S}/lib/hsshellscript.cabal" + sed -i "s:@DEST_IMPORTS:${HSLIB}/imports:" "${S}/lib/hsshellscript.cabal" } src_compile() { - # Fix hsshellscript.cabal library path - sed -i "s:@DEST_LIB:$(ghc-libdir):" \ - ${S}/lib/hsshellscript.cabal - sed -i "s:@DEST_IMPORTS:$(ghc-libdir)/imports:" \ - ${S}/lib/hsshellscript.cabal emake || die "emake failed" } src_install() { # we register the .cabal file generated by make - ghc-setup-pkg ${S}/build/hsshellscript.cabal - make install \ + ghc-setup-pkg "${S}/build/hsshellscript.cabal" + emake install \ DESTDIR="${D}" \ - DEST_LIB="$(ghc-libdir)" \ - DEST_IMPORTS="$(ghc-libdir)/imports" \ + DEST_LIB="${HSLIB}" \ + DEST_IMPORTS="${HSLIB}/imports" \ DEST_DOC="/usr/share/doc/${PF}" \ || die "make failed" - ghc-makeghcilib ${D}/$(ghc-libdir)/libhsshellscript.a + ghc-makeghcilib "${D}/${HSLIB}/libhsshellscript.a" ghc-install-pkg - fperms 0644 $(ghc-libdir)/imports/hsshellscript.h + fperms 0644 "${HSLIB}/imports/hsshellscript.h" } |