idl0r       14/04/03 21:32:53

  Modified:             nagstamon-0.9.12_p20140402.ebuild ChangeLog
  Log:
  Migrate to python-r1
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
B427ABC8)

Revision  Changes    Path
1.2                  net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild?r1=1.1&r2=1.2

Index: nagstamon-0.9.12_p20140402.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nagstamon-0.9.12_p20140402.ebuild   3 Apr 2014 20:48:37 -0000       1.1
+++ nagstamon-0.9.12_p20140402.ebuild   3 Apr 2014 21:32:53 -0000       1.2
@@ -1,14 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild,v
 1.1 2014/04/03 20:48:37 idl0r Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild,v
 1.2 2014/04/03 21:32:53 idl0r Exp $
 
 EAPI="5"
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+PYTHON_COMPAT=( python2_6 python2_7 )
 
-inherit eutils python
+inherit eutils python-r1
 
 MY_PN="Nagstamon"
 #MY_P="${MY_PN}-${PV/_/}-20130729"
@@ -28,6 +26,7 @@
        dev-python/lxml
        dev-python/beautifulsoup:python-2
        gnome-base/librsvg
+       dev-python/keyring
        gnome? ( dev-python/egg-python )
        sound? ( media-sound/sox )"
 
@@ -36,8 +35,6 @@
 src_prepare() {
        epatch "${FILESDIR}/nagstamon-0.9.11_rc1-resources.patch"
 
-       python_convert_shebangs 2 nagstamon.py
-
        rm Nagstamon/resources/LICENSE
        rm Nagstamon/BeautifulSoup.py
 }
@@ -46,32 +43,24 @@
        # setup.py is broken
        cd Nagstamon/
 
-       doman resources/nagstamon.1 || die
+       doman resources/nagstamon.1
        rm resources/nagstamon.1
 
-       nagstamon_install() {
-               exeinto $(python_get_sitedir)/${MY_PN}
-               doexe ../nagstamon.py || die
-               dosym $(python_get_sitedir)/${MY_PN}/${PN}.py /usr/bin/${PN} || 
die
+       newbin ../nagstamon.py nagstamon
 
+       nagstamon_install() {
                insinto $(python_get_sitedir)/${MY_PN}
-               doins {GUI,Config,Objects,Custom,Actions}.py || die
+               doins {GUI,Config,Objects,Custom,Actions}.py
                touch "${D}/$(python_get_sitedir)/${MY_PN}/__init__.py" || die
-               doins -r Server/ || die
+               doins -r Server/
 
                insinto /usr/share/${PN}/resources
-               doins resources/* || die
+               doins resources/*
 
-               domenu "${FILESDIR}"/${PN}.desktop || die
+               domenu "${FILESDIR}"/${PN}.desktop
        }
 
-       python_execute_function nagstamon_install
-}
-
-pkg_postinst() {
-       python_mod_optimize ${MY_PN}
-}
+       python_foreach_impl nagstamon_install
 
-pkg_postrm() {
-       python_mod_cleanup ${MY_PN}
+       python_replicate_script "${D}/usr/bin/nagstamon"
 }



1.44                 net-analyzer/nagstamon/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagstamon/ChangeLog?rev=1.44&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagstamon/ChangeLog?rev=1.44&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagstamon/ChangeLog?r1=1.43&r2=1.44

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog   3 Apr 2014 20:48:37 -0000       1.43
+++ ChangeLog   3 Apr 2014 21:32:53 -0000       1.44
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagstamon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.43 
2014/04/03 20:48:37 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.44 
2014/04/03 21:32:53 idl0r Exp $
+
+  03 Apr 2014; Christian Ruppert <[email protected]>
+  nagstamon-0.9.12_p20140402.ebuild:
+  Migrate to python-r1
 
 *nagstamon-0.9.12_p20140402 (03 Apr 2014)
 




Reply via email to