dev-games/ogre: Bump all three ebuilds, not tested yet.

4 files changed, 20 insertions, 21 deletions

diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 87384fb..615f01b 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1 +1,2 @@
-DIST ogre-1.10.11.zip 133064317 SHA256 2d14a685857865c4acfb54b8eddce31e423b0dd0a556cf563de47b31d1d40624 SHA512 db207aec8330ec9da2a9781c8753411e69e08008995b8b3e127d454dc05aa899c75157718398ca24998644c586e2dd30cc7e9b7d98e045e4575537f5c81a5a54 WHIRLPOOL e914d2aa9bdee60d6421c6462e054a56700e3ceb2f76d24b491304a6c5b4ef0a00de5c5743739d0e7bac279f7364feba6df74a38beeeb8cfde54ecc5b47adb34
+DIST ogre-1.10.12.zip 133067192 SHA256 43ddecf937191aae46acfb6bf73ef107b7366b0336bf0cfe49dea4b1bfc24ed9 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041 WHIRLPOOL d52a0c2a157431a4339edb9538e5f9317219ce10b25383beb54d9936995e11d89760bc782da5d253ecb87d0a3ee6f778cb44aed2a70ca85cb114dcd868e3e77f
+DIST ogre-1.11.1.zip 127416797 SHA256 d83025d2b79c7f9acd4efbdcba48d4d8ba80996ec056c39e567232df5de53919 SHA512 661443166bec11dda9b8b752a16ca8528e772071cde85fcfb436aed915b5d43d77707a96351014a80c3a34137dc6c3c843c2217602ded751f83eb1e10c221af3 WHIRLPOOL 6b03f628f1a9b5f6c1d6e4bec7c3d15a43680177ab017ab9a2c1f44535b50372704f99d796753c9cc14641b8d38959e9e70e7aeb29e66c080587371523258b34
diff --git a/dev-games/ogre/ogre-1.10.11.ebuild b/dev-games/ogre/ogre-1.10.12.ebuild
index b525604..3094851 100644
--- a/dev-games/ogre/ogre-1.10.11.ebuild
+++ b/dev-games/ogre/ogre-1.10.12.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=6
 
-inherit eutils cmake-utils vcs-snapshot
+inherit cmake-utils
 
 DESCRIPTION="Object-oriented Graphics Rendering Engine"
-HOMEPAGE="http://www.ogre3d.org/"
+HOMEPAGE="https://www.ogre3d.org/"
 SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip"
 
 LICENSE="MIT public-domain"
@@ -22,26 +22,27 @@ REQUIRED_USE="examples? ( ois )
 RESTRICT="test" #139905
 
 RDEPEND="
-	cg? ( media-gfx/nvidia-cg-toolkit )
 	dev-libs/boost
 	dev-libs/zziplib
-	freeimage? ( media-libs/freeimage )
-	gl3plus? ( >=media-libs/mesa-9.2.5 )
-	gles2? ( >=media-libs/mesa-9.0.0[gles2] )
-	gles3? ( >=media-libs/mesa-10.0.0[gles2] )
 	media-libs/freetype:2
-	ois? ( dev-games/ois )
-	tools? ( dev-libs/tinyxml[stl] )
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXaw
 	x11-libs/libXrandr
-	x11-libs/libXt"
+	x11-libs/libXt
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	freeimage? ( media-libs/freeimage )
+	gl3plus? ( >=media-libs/mesa-9.2.5 )
+	gles2? ( >=media-libs/mesa-9.0.0[gles2] )
+	gles3? ( >=media-libs/mesa-10.0.0[gles2] )
+	ois? ( dev-games/ois )
+	tools? ( dev-libs/tinyxml[stl] )"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
 	virtual/pkgconfig
-	x11-proto/xf86vidmodeproto"
+	x11-base/xorg-proto
+	doc? ( app-doc/doxygen )"
+
 PATCHES=(
 	"${FILESDIR}/${P}-samples.patch"
 	"${FILESDIR}/${P}-resource_path.patch"
diff --git a/dev-games/ogre/ogre-1.11-r20180423.ebuild b/dev-games/ogre/ogre-1.11.1.ebuild
index 7e2bf1f..1254535 100644
--- a/dev-games/ogre/ogre-1.11-r20180423.ebuild
+++ b/dev-games/ogre/ogre-1.11.1.ebuild
@@ -3,18 +3,15 @@
 
 EAPI=6
 
-inherit eutils cmake-utils mercurial
+inherit cmake-utils
 
 DESCRIPTION="Object-oriented Graphics Rendering Engine"
-HOMEPAGE="http://www.ogre3d.org/"
-
-EHG_REPO_URI="https://bitbucket.org/sinbad/ogre"
-EHG_REVISION="a321ca311c7d87e664b37590a9c8f0b102475dc5"
-SRC_URI=""
+HOMEPAGE="https://www.ogre3d.org/"
+SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip"
 
 LICENSE="MIT public-domain"
 SLOT="0/1.11"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="cg debug doc double-precision examples +freeimage gl3plus gles2 gles3 \
 json ois openexr +opengl pch profile tools"
diff --git a/dev-games/ogre/ogre-2.1-r20180420.ebuild b/dev-games/ogre/ogre-2.1-r20180723.ebuild
index df03ea3..1a2589c 100644
--- a/dev-games/ogre/ogre-2.1-r20180420.ebuild
+++ b/dev-games/ogre/ogre-2.1-r20180723.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Object-oriented Graphics Rendering Engine"
 HOMEPAGE="http://www.ogre3d.org/"
 
 EHG_REPO_URI="https://bitbucket.org/sinbad/ogre"
-EHG_REVISION="2610e3b582ac2486ce2792e2ce5e37ff2dd78808"
+EHG_REVISION="8a9730c9ae9a"
 SRC_URI=""
 
 LICENSE="MIT public-domain"