cabal2ebuild 0.0.15.6 → 0.0.15.7

raw patch · 2 files changed

+7/−7 lines, 2 files

Files

• Depend.hs +6/−6
• cabal2ebuild.cabal +1/−1

@@ -48,7 +48,7 @@ ebDepend :: Dependency -> Maybe String ebDepend dp   = let ( b, a ) = ebPkgVersion dp-     in fmap ( \n -> b ++ n ++ a ) $ ebPkgName dp+     in fmap ( \n -> b ++ n ++ (if null a then "" else "-") ++ a ) $ ebPkgName dp                ebPkgName :: Dependency -> Maybe String@@ -70,13 +70,13 @@ getPkgVersion ( UnionVersionRanges vr1 vr2 )   = let ( b1, a1 ) = getPkgVersion vr1         ( b2, a2 ) = getPkgVersion vr2-     in ( b2 ++ b1, "-" ++ a1 )-getPkgVersion ( ThisVersion v ) = ( "=", "-" ++ showVersion v )-getPkgVersion ( LaterVersion v ) = ( ">", "-" ++ showVersion v )-getPkgVersion ( EarlierVersion v ) = ( "<", "-" ++ showVersion v )+     in ( b2 ++ b1, a1 )+getPkgVersion ( ThisVersion v ) = ( "=", showVersion v )+getPkgVersion ( LaterVersion v ) = ( ">", showVersion v )+getPkgVersion ( EarlierVersion v ) = ( "<", showVersion v ) getPkgVersion ( IntersectVersionRanges v1 v2 ) = getPkgVersion v1 getPkgVersion ( WildcardVersion v@Version{versionBranch = vb} ) =-	( "<", "-" ++ showVersion v{versionBranch = init vb ++ [last vb + 1]} )+	( "<", showVersion v{versionBranch = init vb ++ [last vb + 1]} )  getDepPkgVersion :: Dependency -> VersionRange getDepPkgVersion ( Dependency _ vr ) = vr

@@ -1,5 +1,5 @@ Name:                cabal2ebuild-Version:             0.0.15.6+Version:             0.0.15.7 Stability:           Experimental Synopsis:            make gentoo's .ebuild file from .cabal file Description: