Version bump. Remove old versions. Fix bug 315079.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 71 insertions, 120 deletions

diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index 38aea7208dcc..4ff46012a6d5 100644
--- a/net-analyzer/nagstamon/ChangeLog
+++ b/net-analyzer/nagstamon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nagstamon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.9 2010/02/20 16:51:42 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.10 2010/04/29 23:44:37 idl0r Exp $
+
+*nagstamon-0.9.3 (29 Apr 2010)
+
+  29 Apr 2010; Christian Ruppert <idl0r@gentoo.org> -nagstamon-0.9.0.ebuild,
+  -files/nagstamon-0.9.0-import.patch, -nagstamon-0.9.2.ebuild,
+  +nagstamon-0.9.3.ebuild:
+  Version bump. Remove old versions. Fix bug 315079.
 
 *nagstamon-0.9.2 (20 Feb 2010)
 
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.9.0-import.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.0-import.patch
deleted file mode 100644
index d68327b4a5bb..000000000000
--- a/net-analyzer/nagstamon/files/nagstamon-0.9.0-import.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Nagstamon/nagstamon.orig	2010-01-28 17:03:54.000000000 +0100
-+++ Nagstamon/nagstamon	2010-01-29 23:52:24.957918656 +0100
-@@ -23,7 +23,7 @@
- import gobject
- 
- # Initiate Config
--from Nagstamon.nagstamonConfig import Config
-+from nagstamonConfig import Config
- conf = Config()
- 
- # check for old settings when upgrading from a nagstamon version < 0.8 and convert them
-@@ -38,8 +38,8 @@
-     Resources = ""
-     
- # initialize GUI and actions
--from Nagstamon import nagstamonGUI
--from Nagstamon import nagstamonActions
-+import nagstamonGUI
-+import nagstamonActions
- 
-     
- ###### MAIN ##############
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.0.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.0.ebuild
deleted file mode 100644
index a7e347d4198b..000000000000
--- a/net-analyzer/nagstamon/nagstamon-0.9.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.0.ebuild,v 1.1 2010/01/30 22:57:20 dertobi123 Exp $
-
-EAPI="2"
-
-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-lang/python-2.4
-	dev-python/pygtk
-	dev-python/lxml
-	gnome? ( || ( dev-python/gnome-python-extras dev-python/egg-python ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-sharedir.patch"
-	epatch "${FILESDIR}/${P}-import.patch"
-}
-
-src_install() {
-	cd "${S}/Nagstamon/"
-	exeinto $(python_get_sitedir)/${PN}
-	doexe nagstamon
-	doexe nagstamonActions.py
-	doexe nagstamonConfig.py
-	doexe nagstamonGUI.py
-	doexe nagstamonObjects.py
-	dosym $(python_get_sitedir)/${PN}/${PN} /usr/bin/${PN}
-
-	dodir /usr/share/${PN}/resources
-	insinto /usr/share/${PN}/resources
-	doins resources/*
-
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
-}
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.2.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.2.ebuild
deleted file mode 100644
index d32a47b48123..000000000000
--- a/net-analyzer/nagstamon/nagstamon-0.9.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.2.ebuild,v 1.1 2010/02/20 16:51:42 idl0r Exp $
-
-EAPI="2"
-
-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-lang/python-2.4
-	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"
-}
-
-src_install() {
-	cd "${S}/Nagstamon/"
-	exeinto $(python_get_sitedir)/${PN}
-	doexe nagstamon
-	doexe nagstamonActions.py
-	doexe nagstamonConfig.py
-	doexe nagstamonGUI.py
-	doexe nagstamonObjects.py
-	dosym $(python_get_sitedir)/${PN}/${PN} /usr/bin/${PN}
-
-	dodir /usr/share/${PN}/resources
-	insinto /usr/share/${PN}/resources
-	doins resources/*
-
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
-}
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.3.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.3.ebuild
new file mode 100644
index 000000000000..33408eacf201
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-0.9.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 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.1 2010/04/29 23:44:37 idl0r Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+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
+}