[gentoo-commits] proj/gamerlay:master commit in: x11-apps/typhon/

[Marcel Unbehaun]

commit:     c165a83873f06177ad13c60af95a1a7a3bdaa1b5
Author:     Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Thu Jul  5 16:42:02 2012 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Thu Jul  5 16:42:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=c165a838

[x11-apps/typhon]	first ebuild for new typhon2 svn typhon-9999.ebuild

---
 x11-apps/typhon/metadata.xml          |    2 +-
 x11-apps/typhon/typhon-1.0_rc1.ebuild |   43 ---------------------------------
 x11-apps/typhon/typhon-9999.ebuild    |   10 +++----
 3 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/x11-apps/typhon/metadata.xml b/x11-apps/typhon/metadata.xml
index 7a6cf85..6da3f74 100644
--- a/x11-apps/typhon/metadata.xml
+++ b/x11-apps/typhon/metadata.xml
@@ -11,7 +11,7 @@ Typhon is a slim and themeable opengl dashboard / program launcher.
 </longdescription>
   <use>
 	<flag name="mmd">enable mikumikudance model support</flag> 
-    <flag name="opencv">Add opencv support</flag>
+	<flag name="sfe">enabled shared sfemovie support</flag>
 	<flag name="p3t">enabled shared libp3t support</flag>
   </use>
 </pkgmetadata>

diff --git a/x11-apps/typhon/typhon-1.0_rc1.ebuild b/x11-apps/typhon/typhon-1.0_rc1.ebuild
deleted file mode 100644
index 4be3fb1..0000000
--- a/x11-apps/typhon/typhon-1.0_rc1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: x11-apps/typhontyphon-9999.ebuild,v 1.0 2011/01/18 09:21:06 by frostwork Exp $
-
-EAPI="2"
-
-CMAKE_MIN_VERSION=2.8
-
-inherit cmake-utils eutils
-
-DESCRIPTION="A slim and themeable opengl dashboard / program launcher"
-HOMEPAGE="http://www.frostworx.de/?p=1"
-SRC_URI="http://www.frostworx.de/typhon/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ffmpeg glut +sound +xml"
-
-S="${WORKDIR}/${P/_/-}"
-
-RDEPEND="media-libs/ftgl
-	virtual/opengl
-	media-libs/devil[jpeg,opengl,png]
-	x11-libs/libXrender
-	x11-libs/libXrandr
-	xml? ( dev-libs/tinyxml )
-	glut? ( media-libs/freeglut )
-	ffmpeg? ( >=virtual/ffmpeg-0.6 )
-	sound? ( media-libs/sdl-mixer )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use !sound NOSOUND)
-		$(cmake-utils_use !glut NOGLUT)
-		$(cmake-utils_use !ffmpeg NOVIDEOPLAYER)
-		$(cmake-utils_use debug DEBUG)
-		$(cmake-utils_use xml xml)
-	)
-
-	cmake-utils_src_configure
-}

diff --git a/x11-apps/typhon/typhon-9999.ebuild b/x11-apps/typhon/typhon-9999.ebuild
index 8655aa6..906b83d 100644
--- a/x11-apps/typhon/typhon-9999.ebuild
+++ b/x11-apps/typhon/typhon-9999.ebuild
@@ -17,26 +17,24 @@ HOMEPAGE="http://www.frostworx.de/?p=1"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug mmd opencv +p3t +xml"
+IUSE="debug mmd sfe +p3t"
 
 S="${WORKDIR}/${P/_/-}"
 
 RDEPEND="virtual/opengl
+	dev-libs/tinyxml
 	media-libs/libpng
 	>=media-libs/libsfml-2.0
-	opencv? ( media-libs/opencv )
+	sfe? ( media-libs/sfemovie )
 	sys-libs/zlib
 	mmd? ( media-libs/libmmd )
-	p3t? ( media-libs/libp3t )	
-	xml? ( dev-libs/tinyxml )"
+	p3t? ( media-libs/libp3t )"
 DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use debug DEBUG)
-		$(cmake-utils_use xml xml)
 		$(cmake-utils_use !mmd NOMMD)
-		$(cmake-utils_use !opencv NOCV)		
 	)
 
 	cmake-utils_src_configure