games-action/monadius: loosen deps for OpenGL-2.5

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
gentoo-haskell · Feb 11, 2012 · 3d90e10 · 3d90e10
1 parent ced564a
commit 3d90e10
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/games-action/monadius/Manifest b/games-action/monadius/Manifest
@@ -1,5 +1,6 @@
 AUX monadius-0.95-OpenGL-2.4.patch 57508 RMD160 491cf92ffa4133552cfd9a9c04daaccc41b45acf SHA1 b1bcfe1932410c6f37ee2c08a5a871cd7138189d SHA256 5dc526fe209dca42da9723a7f759966882ba2348934470cf3755e6be21c40b53
+AUX monadius-0.95-OpenGL-2.5.patch 566 RMD160 d5728591f1a4404d298274b8232dee08aed81d6c SHA1 b0a09c616fdbc813d0dac226bdeb22b130b13ac9 SHA256 aaf19565b78520b79a5ad0f29d26a1e51fb537f2da77c0dd3da9787cc814d811
 AUX monadius-0.95-ghc-7.4.1-rc1.patch 864 RMD160 2d9a25956d205a0e57758ec954eb78c9252d3831 SHA1 e8e6bbdd5351d98f5d68c6d8115fb0367f1e9976 SHA256 d367a299b7423b650c03ada22724ef39c93ae9b6b09ac57e85da9abc0fe1bcd3
 DIST Monadius-0.95.tar.gz 45676 RMD160 5f4a83d033db22052982b053b8266b4bc2908c37 SHA1 9421050706050ad6898ae101713d9200c7cf9a1a SHA256 7d136e4b0f3e16afcb5696e1393c867a485628af7688e7bf9151993d41c5a8df
-EBUILD monadius-0.95-r1.ebuild 969 RMD160 0733bf1ddafa7621abf0868cc74cd4976c491832 SHA1 10bb1cf53120f0a3943c044ac49ce4b4b17917e6 SHA256 b65e100f284a3e9ec3ce89c8a3416f8d6e1ab4a4c3ca1fca1d91c3d31e5cd47d
+EBUILD monadius-0.95-r2.ebuild 1060 RMD160 ffe0d021dca23ec96ec6c6215d3c8e87ab8d5701 SHA1 d2a76d3aae9b08eab0a8522c52d681d3b06afdbd SHA256 6bdc52439b23c503a11a35f5222eb93e5ea1a241c1fd34df5591a2cc581a5525
 MISC metadata.xml 405 RMD160 287e29002f86313ca13f12f0e2bdc79c2a167110 SHA1 6d1bea3bbb5b54d14c38d001139f3e749bc2379b SHA256 cf9099829b8b16ea944e401563f90f3931416cf11d0d58748e055f0afc7e44ac
diff --git a/games-action/monadius/files/monadius-0.95-OpenGL-2.5.patch b/games-action/monadius/files/monadius-0.95-OpenGL-2.5.patch
@@ -0,0 +1,15 @@
+diff --git a/Monadius.cabal b/Monadius.cabal
+index f465515..2d5afb1 100644
+--- a/Monadius.cabal
++++ b/Monadius.cabal
+@@ -25,8 +25,8 @@ Executable monadius
+   Build-depends:       base      >= 4 && < 5
+                      , array     >= 0.3 && < 0.5
+                      , directory >= 1.1 && < 1.2
+-                     , GLUT      >= 2.2 && < 2.3
+-                     , OpenGL    >= 2.4 && < 2.5
++                     , GLUT      >= 2.2 && < 2.4
++                     , OpenGL    >= 2.4 && < 2.6
+
+   Hs-source-dirs:      Monadius
+   Ghc-options:         -Wall
diff --git a/...s-action/monadius/monadius-0.95-r1.ebuild → ...s-action/monadius/monadius-0.95-r2.ebuild b/...s-action/monadius/monadius-0.95-r1.ebuild → ...s-action/monadius/monadius-0.95-r2.ebuild
@@ -25,14 +25,16 @@ RDEPEND="virtual/opengl
 	media-libs/freeglut"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.6
-		=dev-haskell/glut-2.2*
-		=dev-haskell/opengl-2.4*
+		>=dev-haskell/glut-2.2 <dev-haskell/glut-2.4
+		>=dev-haskell/opengl-2.4 <dev-haskell/opengl-2.6
 		>=dev-lang/ghc-7.0.1"
 
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=("${FILESDIR}/${PN}"-0.95-ghc-7.4.1-rc1.patch
-	"${FILESDIR}/${PN}"-0.95-OpenGL-2.4.patch)
+	"${FILESDIR}/${PN}"-0.95-OpenGL-2.4.patch
+	"${FILESDIR}/${PN}"-0.95-OpenGL-2.5.patch
+	)
 
 src_configure() {
 	# WORKAROUND: