[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagstamon/files/, net-analyzer/nagstamon/

[Christian Ruppert]

commit:     60531c074938c4734403e010536fdd3c4987397a
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 17:39:23 2016 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 17:39:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60531c07

net-analyzer/nagstamon: Version bump to 2.0

Package-Manager: portage-2.3.0

 net-analyzer/nagstamon/Manifest                    |  1 +
 .../nagstamon/files/nagstamon-2.0-setup.patch      | 25 ++++++++++
 net-analyzer/nagstamon/nagstamon-2.0.ebuild        | 57 ++++++++++++++++++++++
 3 files changed, 83 insertions(+)

diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index d4177be..e7e9204 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,2 +1,3 @@
 DIST Nagstamon-1.0.1.tar.gz 455110 SHA256 e60a2b1fef842deb8377ace02df6791f3dcc5683d9dae4323de3f5f1f8a9893b SHA512 040f3ac03c4945b25345f36d4749903238e05001f40f2777afe5277588aababb24212b538890c4b0ff0e1edef9a950804deb93fb2111bc25c8a773a84b69c353 WHIRLPOOL 8d040c7bb1573451ec0bb7439f0795b8ec6003d292429d3a96a07bb68d0617b23838677c93183d22a9cea10620152b51a3e7d4940642560986d5890f98b13822
+DIST Nagstamon-2.0.tar.gz 532668 SHA256 ff2172d467be6c9c68913aed05978949330ac7d069581b81c050eb4f90ff6443 SHA512 c8190a38b6a215dbfe07281b54d9effe2d79eb4c3219a868852514d921798b0097575423d7f7116ee1d49a949f0e9760ac536cb7aebfe49fa1676033670a71bd WHIRLPOOL 7c3652ff3773e5a09c460d43ba490239efa46be5e4fa63fd0f8194e65f05832877aade5d504a080f98023e1d17be5fbacfeeafcf49ad633b4bf2285d2d8cf8db
 DIST Nagstamon-b7a91e68ca93ead4e5cfef22e2226c1ff9c7b52c.tar.gz 7021698 SHA256 0f3a6552d033ce91a5070ddb7570ce83c99f74b4e13f8e504f6d3fafc7b3f6a3 SHA512 f24d561127d6ae82acd084fbc4d7eeec6a31f0d37b123e42565347cd8eb2e8cac4f6c9ed77c50f8d16cc7f94fdf771404397ac7f847e7a7a094a7bb53c3fadab WHIRLPOOL 45d03e134687a7716a148d4cbff716cc8e933aef51eb9cdc46403f08243cc66afeb431eac2e1f18c8f0683ca4d5cf2bf8f9fd677f4d4df0f6e55a7b26b7ddda0

diff --git a/net-analyzer/nagstamon/files/nagstamon-2.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-2.0-setup.patch
new file mode 100644
index 00000000..3a58227
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-2.0-setup.patch
@@ -0,0 +1,25 @@
+diff --git a/setup.py b/setup.py
+index 467bb42..24644a3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -35,7 +35,7 @@ if platform.system() not in ['Windows', 'Darwin']:
+     NAME = NAME.lower()
+ VERSION = AppInfo.VERSION
+
+-NAGSTAMON_SCRIPT = 'nagstamon.py'
++NAGSTAMON_SCRIPT = 'nagstamon'
+
+ # workaround to get directory of Qt5 plugins to add missing 'mediaservice' folder needed for audio on OSX and Windows
+ import os.path
+@@ -134,10 +134,7 @@ setup(name=NAME,
+                   'Nagstamon.thirdparty.Xlib.ext',
+                   'Nagstamon.thirdparty.Xlib.protocol',
+                   'Nagstamon.thirdparty.Xlib.support',
+-                  'Nagstamon.thirdparty.Xlib.xobject',
+-                  'Nagstamon.thirdparty.keyring',
+-                  'Nagstamon.thirdparty.keyring.backends',
+-                  'Nagstamon.thirdparty.keyring.util'],
++                  'Nagstamon.thirdparty.Xlib.xobject',],
+       package_dir={'Nagstamon':'Nagstamon'},
+       package_data={'Nagstamon':['resources/*']},
+       data_files=[('%s/share/man/man1' % sys.prefix, ['Nagstamon/resources/nagstamon.1.gz']),

diff --git a/net-analyzer/nagstamon/nagstamon-2.0.ebuild b/net-analyzer/nagstamon/nagstamon-2.0.ebuild
new file mode 100644
index 00000000..851bca1
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-2.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit eutils python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_}"
+
+DESCRIPTION="status monitor for the desktop"
+HOMEPAGE="http://nagstamon.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: secretstorage
+# TODO: Xlib - https://github.com/python-xlib/python-xlib/tree/master/Xlib
+RDEPEND="dev-python/PyQt5[gui,multimedia,svg,widgets]
+	dev-python/beautifulsoup:4
+	dev-python/dbus-python
+	dev-python/keyring
+	dev-python/requests
+	dev-python/psutil
+	dev-python/setuptools"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES="${FILESDIR}/${P}-setup.patch"
+
+src_prepare() {
+	default_src_prepare
+
+	mv ${PN}.py ${PN} || die
+
+#	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+	rm -rf "${S}/Nagstamon/thirdparty/keyring/" || die
+}
+
+pkg_preinst() {
+	if has_version "<net-analyzer/nagstamon-2.0"; then
+		OLD_NAGSTAMON_VERSION=yup
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${OLD_NAGSTAMON_VERSION}" ]; then
+		ewarn "WARNING: It is recommend to move your old Nagstamon 1.x ~/.nagstamon/ away and start from scratch!"
+	fi
+}