Fix resource loading properly, Add missing __init__.py.

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64

4 files changed, 46 insertions, 18 deletions

diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index e5d73a901e5e..bb0f6cdbf599 100644
--- a/net-analyzer/nagstamon/ChangeLog
+++ b/net-analyzer/nagstamon/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2011/02/12 02:12:55 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.14 2011/02/12 02:37:53 idl0r Exp $
+
+*nagstamon-0.9.5_rc1-r1 (12 Feb 2011)
+
+  12 Feb 2011; Christian Ruppert <idl0r@gentoo.org>
+  -nagstamon-0.9.5_rc1.ebuild, +nagstamon-0.9.5_rc1-r1.ebuild,
+  +files/nagstamon-0.9.5-resources.patch:
+  Fix resource loading properly, Add missing __init__.py.
 
 *nagstamon-0.9.5_rc1 (12 Feb 2011)
 
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 1b988d3c162e..92bbb17db669 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -2,23 +2,24 @@
 Hash: SHA256
 
 AUX nagstamon-0.9.0-sharedir.patch 659 RMD160 08d8455865dae06277ec818dd9beae61eff6a809 SHA1 858ddf7684912bc307011da637fe2441f67e494c SHA256 611b277d4ece607268480d16455158f1023778d6989b6e2a129d570b473a1f41
+AUX nagstamon-0.9.5-resources.patch 844 RMD160 0d5bacf97600221dcde421fb631ea94753b44031 SHA1 581a9a0c4ffa5be06674146ddc1a5bc8829f5e10 SHA256 130fc539f6e46e368327efbe9c0f3a07cc5db18e4c9546a46d81de552c31ede5
 AUX nagstamon.desktop 302 RMD160 2fb15e01f92eb80f8ec07238015c528720ac781d SHA1 166d4cd8a550e1427ef266b32a44dbb57fe0670b SHA256 409c7d223818a121172faf6733e0e2d9ba5c23caa374769fdc787dab106bf035
 DIST nagstamon_0.9.3.tar.gz 168728 RMD160 3c60d84d9f3fc255aeffec2c6bbac111f4816c1c SHA1 18129f4e23b2ca3023a767aa7a59bdcdaf27c8bc SHA256 0facfbbc590cc4ff21ca2acbd97172656d2cb1350e234c91ce4a628bf572acc5
 DIST nagstamon_0.9.4.tar.gz 165591 RMD160 b503f25054953382bb7ae1824b30bc509988a511 SHA1 e938d0ea50cc8637b70f3b34e7101048a21370de SHA256 cae554d43064f56eae6e224493fb00d28229fff2bf750519f3b5ec5f2552b6b7
 DIST nagstamon_0.9.5-rc1.tar.gz 313763 RMD160 4bfff5e1973df767393bd456807ea821838603fc SHA1 a18336226cfeefc25e2ef3bd0aebc256931d834e SHA256 912e98dcd42665a34876d26bcd457bb9dd77c0fe5b52adbc82d6b7db23fdf0f8
 EBUILD nagstamon-0.9.3.ebuild 1617 RMD160 18d811f5ee77a5e2c213636e7bc09ca39b70f3b1 SHA1 b2b34693bcaad79e23121f4ffc1480520eb618da SHA256 c7d0e6fd33e6c1021d12c7e6fb1c58dd006eda511edb024898a17302713c93f5
 EBUILD nagstamon-0.9.4.ebuild 1617 RMD160 d55eae693267b058244895c5de323ec8a7838bdc SHA1 6f7ef7f4eae2c92dfd2b19fccf96bdbe583844f1 SHA256 0ae7dbdcd1fcec50b315e309f9e3581e83857baf5636243c9819cae01747cf83
-EBUILD nagstamon-0.9.5_rc1.ebuild 1632 RMD160 e4218f0ffe6fcaad3f85fa7b361584bc63e7dcad SHA1 939257dec572a173acaed55cb345aa85e03e8461 SHA256 edab06e4be69baee9c8f0711a733a6dfbeb3d6dd821b4859b270292d5ebadc12
-MISC ChangeLog 3015 RMD160 70a1b361bca7bc677f3f2a8c9e2807887fd5dcc1 SHA1 789cfe475e5f7f481f2917b83405ccf819b5e3c5 SHA256 2bb912602b9a6b802d55a3813e28b99859846c4f5cf8b82f4bb1efd1a4f96651
+EBUILD nagstamon-0.9.5_rc1-r1.ebuild 1676 RMD160 526869f00678008f61e2fc54825968150db1b34e SHA1 16492adac5fa7a3978061a907253644b10aa24d3 SHA256 d8b4e5a00f35b1af5b3c10e1a3c3afbcbbe69048d5c51a06ca147c2380366341
+MISC ChangeLog 3270 RMD160 941e01cd1cd6e93dbe68933b325ff4e249f0a86d SHA1 143ee8a5ee1f7afc57320353aa3d1b1d3ca389aa SHA256 0f7f4fb5c86ba9b3de8d736ed0e5c8e0f76d1b0f5d2c6be2a0a580a691b4e5d1
 MISC metadata.xml 260 RMD160 ac6f569eb1667b364a6d503a3f273505ff0ee274 SHA1 07ea89243966d135d235f7e464a480ab0e698d6b SHA256 eafa2ff6e208c288e02395e29355263b6c969ae23f19ec118835c14f2fcee05f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBCAAGBQJNVeywAAoJEMOx0zmdw4Z1sScH/iFJxhj+zeDIyY/WKn6SihBM
-AQpUEMENFDJou4wNolFY1DN2GXy3SFIVESnL7sRBokElV2gSdruLW0rXv/e+tAPb
-2jJbsVVcQ8j1B/WnYf9QNK33WvRX7qddGUbHTSYWVWxgolZiQ0SQzW4ajvZvg/y1
-JmXgDOe51oVw2pPTPkWNRQ2mG83Em90llntXbrPmn7ACrAReHStDoz/WI6scTHfi
-ui8R2TSwoGNFmvIM997MXxsC0xjnivRZtZzlouFTFFbeFzL4+YqFu6l2p1b/gUZT
-7dyDn9SszKFcREWVa41mSUY+X8P6fUmkiOgn+htpGotsTG5aZGaPDAb35pSL+9A=
-=U0Cw
+iQEcBAEBCAAGBQJNVfKGAAoJEMOx0zmdw4Z1XUgIAL7B+ajnQLtnWjI2VWLD8hZp
+rP9WhreOFbU1rSN//eAtV5NJOMvTUipBvzvuHsvrO/JbMZP5CwdVRD9SAgCb/Ixa
+k6M1KuXrwKPMaUmfhbf2to+2J24FVMa8s+rvmT2HDFZdJ8xoL8QX/6eKdmElIxWQ
+h4dTdY+EG20a2+lCazvyf3x5yQLjWX+CcpNEBjdK7BtS9k1HoEtTyx+4xnG3eVB9
+z+4G0TU8rhC18MJgbGNNJjQJyHLBYYMn5htn9YYGksPVwqm3zZduqGksRbrwXp0I
+yNZ5wGJOciV3Z/jTe7xqmteKyQjvoATx8jU3/96a1zONJ7NElygO5s6B3+20NjM=
+=HxZ5
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.9.5-resources.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.5-resources.patch
new file mode 100644
index 000000000000..8eef3a5be689
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-0.9.5-resources.patch
@@ -0,0 +1,18 @@
+--- nagstamon.py.old	2011-02-12 03:33:35.154930846 +0100
++++ nagstamon.py	2011-02-12 03:34:08.100522965 +0100
+@@ -32,13 +32,8 @@ conf = Config()
+ # check for old settings when upgrading from a nagstamon version < 0.8 and convert them
+ conf.Convert_Conf_to_Multiple_Servers()
+ 
+-# try to get resources path if nagstamon got be installed by setup.py
+-try:
+-    import pkg_resources
+-    Resources = pkg_resources.resource_filename("Nagstamon", "resources")
+-except Exception, err:
+-    # set resources to "" in case there are no resources available from setup.py
+-    Resources = ""
++# set resources to "" in case there are no resources available from setup.py
++Resources = "/usr/share/nagstamon/resources"
+ 
+ # Resources on MacOS X, environment variable _MEIPASS2 comes from pyinstaller packed executable
+ # - does not really work at the moment
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.5_rc1.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.5_rc1-r1.ebuild
index de124234c0f6..04e6739c9d2e 100644
--- a/net-analyzer/nagstamon/nagstamon-0.9.5_rc1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-0.9.5_rc1-r1.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.5_rc1.ebuild,v 1.1 2011/02/12 02:12:58 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.5_rc1-r1.ebuild,v 1.1 2011/02/12 02:37:53 idl0r Exp $
 
 EAPI="3"
 
@@ -11,6 +11,7 @@ RESTRICT_PYTHON_ABIS="3.*"
 inherit eutils python
 
 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,7 +30,7 @@ RDEPEND="dev-python/pygtk
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	sed -i -e 's:Resources = "":Resources = "/usr/share/nagstamon/resources":' nagstamon.py || die
+	epatch "${FILESDIR}/nagstamon-0.9.5-resources.patch"
 
 	python_convert_shebangs 2 nagstamon.py
 }
@@ -42,12 +43,13 @@ src_install() {
 	rm resources/{LICENSE,nagstamon.1}
 
 	nagstamon_install() {
-		exeinto $(python_get_sitedir)/${PN}
-		newexe ../nagstamon.py 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}
+		insinto $(python_get_sitedir)/${MY_PN}
 		doins {GUI,Config,Objects,Custom,Actions}.py || die
+		touch $(python_get_sitedir)/${MY_PN}/__init__.py || die
 		doins -r Server/ || die
 
 		insinto /usr/share/${PN}/resources
@@ -61,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}
 }