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

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 37 insertions, 14 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/Manifest b/net-analyzer/nagstamon/Manifest
index ba9fe19d2bed..1be6701bc544 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,5 +1,6 @@
 AUX nagstamon-0.6.2-sharedir.patch 716 RMD160 483f4d4f781097147e14f4e6286748c4bec692b0 SHA1 6a766f6637137c6d04e6ab98be2caa45eee170d4 SHA256 85a6860a08c72f749068ac17873c0d4d5edbcb277aeacdf2849174b8ceba7a3a
+AUX nagstamon.desktop 302 RMD160 2fb15e01f92eb80f8ec07238015c528720ac781d SHA1 166d4cd8a550e1427ef266b32a44dbb57fe0670b SHA256 409c7d223818a121172faf6733e0e2d9ba5c23caa374769fdc787dab106bf035
 DIST nagstamon_0.6.2.zip 63719 RMD160 cc8d3e7b5afa355543cf8159cdd1e006626f1611 SHA1 ce753b01fca4ab1fd15609023fef9b27b1e3f2a4 SHA256 129c9bb329b5f8d4681977efce85fc9d6f6a8b3094a567f085e61f981a842c60
-EBUILD nagstamon-0.6.2.ebuild 974 RMD160 596d5819e58a0ab7705d44d8f0c4199f40c2c029 SHA1 335840cbdbc44b13295c9b7e5036115faf82ed59 SHA256 45cf89f75304a428f79f9aa3a7d8c83828c3608d8e5e9fd3de10ecd5965742f9
-MISC ChangeLog 658 RMD160 6b51edc136cc4a1487b7a73a1082cd02c4cc08a2 SHA1 20c1e813f49b553b95ea2e3d718101ae3eb39e73 SHA256 db96e81ef66821a1009d99c8f4ab70cbf0cd29e1f0b39e34245c600fe3b32510
+EBUILD nagstamon-0.6.2-r1.ebuild 1085 RMD160 8fd663bd07238a34520ee2c058ea6f386efb3bf3 SHA1 b56fc8237dc826ba9f5ad5811828416f5ce3bb88 SHA256 cc8543e915b9d9038a04997f7d11ea99509ead4db6c9b74d6db461b5897b4b2d
+MISC ChangeLog 941 RMD160 1ff5e2f34b4567bcbdad2e01119867793bb7dba8 SHA1 489d8286590cc09e426a58fde1b8f28b6bd91a80 SHA256 ab68ab2cfd7804c2c51cdd8c233f3ca58e363d96898505db42387022ad6515cb
 MISC metadata.xml 260 RMD160 ac6f569eb1667b364a6d503a3f273505ff0ee274 SHA1 07ea89243966d135d235f7e464a480ab0e698d6b SHA256 eafa2ff6e208c288e02395e29355263b6c969ae23f19ec118835c14f2fcee05f
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
 }