Version bump. Remove old versions. Fix bug 315079.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index 38aea7208dcc65cb22336e96cc63ac5a4e537d55..4ff46012a6d54ecd9cd3c1f87d73f61b651d1626 100644 (file)
--- 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/Manifest b/net-analyzer/nagstamon/Manifest
index 6f4d5d48a6af1cd9b09f8d6fc02f38f83838c3a2..48c72de58de2cc9eefc89a00ceca5f609b3b3720 100644 (file)
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX nagstamon-0.9.0-import.patch 602 RMD160 b57fc1d623fc84f00f169d54e791206c5c0bf0ef SHA1 3e8f5c1406f600cd8d83e020ba397f064dc1cfe6 SHA256 4b9852740550647cc00ca9538443d2c9fbb2e235eaabd3de54f5a4db5df85c3c
 AUX nagstamon-0.9.0-sharedir.patch 659 RMD160 08d8455865dae06277ec818dd9beae61eff6a809 SHA1 858ddf7684912bc307011da637fe2441f67e494c SHA256 611b277d4ece607268480d16455158f1023778d6989b6e2a129d570b473a1f41
 AUX nagstamon.desktop 302 RMD160 2fb15e01f92eb80f8ec07238015c528720ac781d SHA1 166d4cd8a550e1427ef266b32a44dbb57fe0670b SHA256 409c7d223818a121172faf6733e0e2d9ba5c23caa374769fdc787dab106bf035
-DIST nagstamon_0.9.0.tar.gz 151025 RMD160 cccac90a04b8b917d330b262e40c168fbd2a896c SHA1 176c249e3e28bf8c509fa26c3a245bb53c3b2f4c SHA256 8560b1b63b69cc537585709a8f2a498f36e42c5cd22b27e8593501732dd5ec55
-DIST nagstamon_0.9.2.tar.gz 145601 RMD160 fbadb44702eba2ef72d46ac0fc1d41601cca23c7 SHA1 2c49d9b54cacbc9a813308f337d6d73bb9590ea7 SHA256 e901ea340f8cdb0812e4c0e3ecb102a3da37f13072f2de549d7e0f77223c06f3
-EBUILD nagstamon-0.9.0.ebuild 1239 RMD160 737a342fd8609794bfa10724f72350b360c446f9 SHA1 f7dc8a8262075670eb04a6ebcc1cb436717387d2 SHA256 76dcf5cff8b8d96f0a01d8cff648c0a96f99956993d6a9f1a5fa9bf1bef55c63
-EBUILD nagstamon-0.9.2.ebuild 1201 RMD160 952bc5bb033d290411c617760738ad2c2d1205bc SHA1 3e8adfc142bc80afe43f1257a4fe6d305b5fffe1 SHA256 c33616c15f5d13451f3c7e10964bc0b30043d6692addb2bc6a2b1153189f24f2
-MISC ChangeLog 2334 RMD160 19d0af2b4445ca0cf60fcc1726c60bae96b396ba SHA1 25e818e0116a78f41f88adf296e32bbd552a50b5 SHA256 1edb6e14fddca2bff732f751c0a616eb93dc93435e6e4765267b7df5e01915f6
+DIST nagstamon_0.9.3.tar.gz 168728 RMD160 3c60d84d9f3fc255aeffec2c6bbac111f4816c1c SHA1 18129f4e23b2ca3023a767aa7a59bdcdaf27c8bc SHA256 0facfbbc590cc4ff21ca2acbd97172656d2cb1350e234c91ce4a628bf572acc5
+EBUILD nagstamon-0.9.3.ebuild 1526 RMD160 eb62cea60fdfac19dc3a56e900ffde1809da4ba0 SHA1 f3c06e015c5f5ed29b6a1ce8141c9ff9b92a667f SHA256 b154e308e6a8790fb9172458232b9dec5b392118bde8808f896e54cd526304b3
+MISC ChangeLog 2589 RMD160 c864c5a4634e1faf50bac340993880b35e2871ef SHA1 01d91567b58d55f68a5e7f3ffabd373eebafe7b2 SHA256 aaedcc51013c20d4ca77f558ec4b1f192ada5bc28a1a54935b651189f1010eab
 MISC metadata.xml 260 RMD160 ac6f569eb1667b364a6d503a3f273505ff0ee274 SHA1 07ea89243966d135d235f7e464a480ab0e698d6b SHA256 eafa2ff6e208c288e02395e29355263b6c969ae23f19ec118835c14f2fcee05f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuAEygACgkQixe2jn+ufThX1wCfUe7hr9dauHCjGoc6RUPI8gtc
-TpwAn0UrzjT99tXbfh1guNYykx+6tKjo
-=NytQ
+iEYEARECAAYFAkvaGesACgkQixe2jn+ufTjWYACgiS3HR07EkaaFFfgojLuIXPut
+AIIAniXhspjmJJvjzAPbRL49f37wzeHJ
+=aY6I
 -----END PGP SIGNATURE-----

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 (file)
index d68327b..0000000
--- 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 (file)
index a7e347d..0000000
--- 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 (file)
index d32a47b..0000000
--- 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 (file)
index 0000000..33408ea
--- /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
+}