Move gnome deps into a gnome USE flag, add desktop file, based on patches by Robin Atwood (bug #250271)

(Portage version: 2.2_rc17/cvs/Linux 2.6.25-gentoo-r7 x86_64)

3 files changed, 34 insertions, 12 deletions

diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index 0c498a452c11..da8cec5b9f1c 100644
--- a/net-analyzer/nagstamon/ChangeLog
+++ b/net-analyzer/nagstamon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nagstamon
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.2 2008/12/05 14:21:42 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.3 2008/12/09 18:25:02 dertobi123 Exp $
+
+*nagstamon-0.6.2-r1 (09 Dec 2008)
+
+  09 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/nagstamon.desktop, -nagstamon-0.6.2.ebuild,
+  +nagstamon-0.6.2-r1.ebuild:
+  Move gnome deps into a gnome USE flag, add desktop file, based on patches by
+  Robin Atwood (bug #250271)
 
 *nagstamon-0.6.2 (05 Dec 2008)
 
diff --git a/net-analyzer/nagstamon/files/nagstamon.desktop b/net-analyzer/nagstamon/files/nagstamon.desktop
new file mode 100644
index 000000000000..2875a72ac5ae
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=Nagstamon
+GenericName=Nagios status monitor
+Comment=Quick status overview of your Nagios monitoring system
+Exec=nagstamon
+Icon=/usr/share/nagstamon/resources/nagstamon.png
+Terminal=false
+Categories=Application;System;
+StartupNotify=true
diff --git a/net-analyzer/nagstamon/nagstamon-0.6.2.ebuild b/net-analyzer/nagstamon/nagstamon-0.6.2-r1.ebuild
index 7981255dfb6c..cca72e774a36 100644
--- a/net-analyzer/nagstamon/nagstamon-0.6.2.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-0.6.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.6.2.ebuild,v 1.1 2008/12/05 14:21:42 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.6.2-r1.ebuild,v 1.1 2008/12/09 18:25:02 dertobi123 Exp $
 
 EAPI="2"
 
 inherit eutils python
 
-MY_P="${PN}_${PV}"
+MY_P=${P/-/_}
 
 DESCRIPTION="Nagstamon is a Nagios status monitor for a systray and displays a realtime status of a Nagios box."
 HOMEPAGE="http://nagstamon.wiki.sourceforge.net"
@@ -15,13 +15,13 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="gnome"
 
 DEPEND=""
 RDEPEND=">=dev-lang/python-2.4
 	dev-python/pygtk
-	dev-python/gnome-python-extras
-	dev-python/lxml"
+	dev-python/lxml
+	gnome? ( || ( dev-python/gnome-python-extras dev-python/egg-python ) )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -30,12 +30,14 @@ src_prepare() {
 }
 
 src_install() {
-	insinto $(python_get_sitedir)/${PN}
-	insopts -m 0755
-	doins nagstamon.py
+	exeinto $(python_get_sitedir)/${PN}
+	doexe nagstamon.py
+	dosym $(python_get_sitedir)/${PN}/${PN}.py /usr/bin/${PN}
 
-	dodir /usr/share/nagstamon
-	cp -a resources "${D}"/usr/share/nagstamon
+	dodir /usr/share/${PN}/resources
+	insinto /usr/share/${PN}/resources
+	doins resources/*
 
-	dosym $(python_get_sitedir)/${PN}/${PN}.py /usr/bin/${PN}
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${PN}.desktop
 }