Version bump to 0.9.6.1. Remove old ebuilds.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 21 insertions, 86 deletions

diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index 7aa672451975..f13ea89342e6 100644
--- a/net-analyzer/nagstamon/ChangeLog
+++ b/net-analyzer/nagstamon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagstamon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.16 2011/04/26 00:05:14 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.17 2011/05/08 11:18:39 idl0r Exp $
+
+*nagstamon-0.9.6.1 (08 May 2011)
+
+  08 May 2011; Christian Ruppert <idl0r@gentoo.org> -nagstamon-0.9.3.ebuild,
+  -nagstamon-0.9.4.ebuild, +nagstamon-0.9.6.1.ebuild:
+  Version bump to 0.9.6.1. Remove old ebuilds.
 
 *nagstamon-0.9.5 (26 Apr 2011)
 
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.4.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.4.ebuild
deleted file mode 100644
index 7a84043c6d23..000000000000
--- a/net-analyzer/nagstamon/nagstamon-0.9.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.4.ebuild,v 1.2 2011/02/12 14:48:05 arfrever Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit eutils python
-
-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.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-DEPEND=""
-RDEPEND="dev-python/pygtk
-	dev-python/lxml
-	gnome? ( || ( dev-python/gnome-python-extras dev-python/egg-python ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.9.0-sharedir.patch"
-
-	python_convert_shebangs 2 Nagstamon/nagstamon
-}
-
-src_install() {
-	# setup.py is broken
-	cd Nagstamon/
-
-	doman resources/nagstamon.1 || die
-	rm resources/{LICENSE,nagstamon.1}
-
-	nagstamon_install() {
-		exeinto $(python_get_sitedir)/${PN}
-		doexe nagstamon || die
-		dosym $(python_get_sitedir)/${PN}/${PN} /usr/bin/${PN} || die
-
-		insinto $(python_get_sitedir)/${PN}
-		doins nagstamonActions.py || die
-		doins nagstamonConfig.py || die
-		doins nagstamonGUI.py || die
-		doins nagstamonObjects.py || die
-
-		insinto /usr/share/${PN}/resources
-		doins resources/* || die
-
-		insinto /usr/share/applications
-		doins "${FILESDIR}"/${PN}.desktop || die
-	}
-
-	python_execute_function nagstamon_install
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.3.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.6.1.ebuild
index 1a8d13a503e2..44d6df6ff44a 100644
--- a/net-analyzer/nagstamon/nagstamon-0.9.3.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-0.9.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.3.ebuild,v 1.3 2011/02/12 14:48:05 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.6.1.ebuild,v 1.1 2011/05/08 11:18:39 idl0r Exp $
 
 EAPI="3"
 
@@ -10,7 +10,8 @@ RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 inherit eutils python
 
-MY_P=${P/-/_}
+MY_P="${PN}_${PV/_/-}"
+MY_PN="Nagstamon"
 
 DESCRIPTION="Nagstamon is a Nagios status monitor for a systray and displays a realtime status of a Nagios box"
 HOMEPAGE="http://nagstamon.sourceforge.net"
@@ -29,9 +30,9 @@ RDEPEND="dev-python/pygtk
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.9.0-sharedir.patch"
+	epatch "${FILESDIR}/nagstamon-0.9.5-resources.patch"
 
-	python_convert_shebangs 2 Nagstamon/nagstamon
+	python_convert_shebangs 2 nagstamon.py
 }
 
 src_install() {
@@ -42,15 +43,14 @@ src_install() {
 	rm resources/{LICENSE,nagstamon.1}
 
 	nagstamon_install() {
-		exeinto $(python_get_sitedir)/${PN}
-		doexe nagstamon || die
-		dosym $(python_get_sitedir)/${PN}/${PN} /usr/bin/${PN} || die
+		exeinto $(python_get_sitedir)/${MY_PN}
+		doexe ../nagstamon.py || die
+		dosym $(python_get_sitedir)/${MY_PN}/${PN}.py /usr/bin/${PN} || die
 
-		insinto $(python_get_sitedir)/${PN}
-		doins nagstamonActions.py || die
-		doins nagstamonConfig.py || die
-		doins nagstamonGUI.py || die
-		doins nagstamonObjects.py || die
+		insinto $(python_get_sitedir)/${MY_PN}
+		doins {GUI,Config,Objects,Custom,Actions}.py || die
+		touch "${D}/$(python_get_sitedir)/${MY_PN}/__init__.py" || die
+		doins -r Server/ || die
 
 		insinto /usr/share/${PN}/resources
 		doins resources/* || die
@@ -63,9 +63,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize ${PN}
+	python_mod_optimize ${MY_PN}
 }
 
 pkg_postrm() {
-	python_mod_cleanup ${PN}
+	python_mod_cleanup ${MY_PN}
 }