--- /usr/portage/games-simulation/flightgear/flightgear-2.8.0.ebuild	2012-12-09 16:31:16.000000000 +0100
+++ flightgear-2.10.0.ebuild	2013-02-19 00:36:13.379039332 +0100
@@ -1,21 +1,23 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-2.8.0.ebuild,v 1.8 2012/12/09 15:09:51 ago Exp $
+# $Header: $
 
-EAPI=4
+EAPI=5
 
-inherit games cmake-utils
+inherit gnome2-utils games cmake-utils
 
 DESCRIPTION="Open Source Flight Simulator"
 HOMEPAGE="http://www.flightgear.org/"
-SRC_URI="mirror://flightgear/Source/${P}.tar.bz2 mirror://flightgear/Shared/FlightGear-data-${PV}.tar.bz2"
+SRC_URI="mirror://flightgear/Source/${P}.tar.bz2
+	mirror://flightgear/Shared/FlightGear-data-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug fgpanel jpeg +jsbsim oldfdm subversion test +udev +yasim"
 
 COMMON_DEPEND="
+	dev-db/sqlite:3
 	>=dev-games/openscenegraph-3.0.1[png]
 	~dev-games/simgear-${PV}[jpeg?,subversion?]
 	sys-libs/zlib
@@ -30,7 +32,6 @@
 # inherited from static version of simgear)
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.37
-	media-libs/freealut
 	media-libs/openal
 	>=media-libs/plib-1.8.5
 	jpeg? ( virtual/jpeg )
@@ -41,17 +42,15 @@
 "
 RDEPEND="${COMMON_DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-fgpanel-linking.patch"
-)
-
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
 		-DENABLE_FGADMIN=OFF
+		-DENABLE_PROFILE=OFF
 		-DENABLE_RTI=OFF
+		-DSYSTEM_SQLITE=ON
 		-DFG_DATA_DIR="${GAMES_DATADIR}"/${PN}
 		-DSIMGEAR_SHARED=ON
 		$(cmake-utils_use_with fgpanel)
@@ -74,8 +73,22 @@
 
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r ../data/*
-	newicon package/${PN}.ico ${PN}.ico
+	newicon -s 48 icons/fg-48.png ${PN}.png
 	newmenu package/${PN}.desktop ${PN}.desktop
 
 	prepgamesdirs
 }
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}