diff options
| -rw-r--r-- | app-cdr/serpentine/ChangeLog | 6 | ||||
| -rw-r--r-- | app-cdr/serpentine/Manifest | 20 | ||||
| -rw-r--r-- | app-cdr/serpentine/serpentine-0.9-r2.ebuild | 25 |
3 files changed, 34 insertions, 17 deletions
diff --git a/app-cdr/serpentine/ChangeLog b/app-cdr/serpentine/ChangeLog index 3fd09674b03e..4356feb26e2d 100644 --- a/app-cdr/serpentine/ChangeLog +++ b/app-cdr/serpentine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-cdr/serpentine # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/serpentine/ChangeLog,v 1.27 2011/04/13 17:12:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/serpentine/ChangeLog,v 1.28 2011/04/16 19:45:06 arfrever Exp $ + + 16 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + serpentine-0.9-r2.ebuild: + Use Python 2 (bug #308329). 13 Apr 2011; Pacho Ramos <pacho@gentoo.org> serpentine-0.9-r2.ebuild: Fix gnome-python dependencies, bug #352914. diff --git a/app-cdr/serpentine/Manifest b/app-cdr/serpentine/Manifest index d71761e46e1d..f23672507f45 100644 --- a/app-cdr/serpentine/Manifest +++ b/app-cdr/serpentine/Manifest @@ -4,13 +4,23 @@ Hash: SHA1 AUX serpentine-0.9-drop_pyxml.patch 5209 RMD160 b7d241b5b043e5b9db742bd22cdeed5dfef00ddb SHA1 0eba1473acf77b5264bf64d1295325b227aadcdf SHA256 f28cef2b6985f1ac76542ed80cbdc6f6a478f3de4630e8157817ff9f60672a0e AUX serpentine-0.9-python24_compat.patch 942 RMD160 068a27dcbc2d6fe4d17041139958968f6efc85f0 SHA1 7c7ab5f3d9414b406063b6b93792aa5ed40b0f63 SHA256 509a2040af75ec271417ce983d1117ac505a63c2e645b045ef5c595c4db23529 DIST serpentine-0.9.tar.bz2 223452 RMD160 783b5f49666b9c8cd3da946ba3b916265c6d2b9a SHA1 b0bb860c9b3d2e7c4f862d07f008d1afd5cbf563 SHA256 40d3239f48b700d63daf43ea80ae77760910e9135ba7a04327f36c5284692f2c -EBUILD serpentine-0.9-r2.ebuild 1597 RMD160 ca3cbf7814ed610540b0f9cda9935e59b40f89a5 SHA1 bdb81821896d44fa608526302082ee8fec8ffc85 SHA256 6f0842e0ef04cba24421ace46f767fe117bf90e69bbbce21298b6509fc98589f -MISC ChangeLog 4046 RMD160 0ae9017b57548608277f85db3e499584f6ae663c SHA1 95f714d90e87d65f3df1301b8011dad32d5203c1 SHA256 07b65ec7dc6b3098cf49e9b8d93843764199dbe943bb8a57fcc28957022c8f92 +EBUILD serpentine-0.9-r2.ebuild 1632 RMD160 47ac1f57d50cf4ba68a6895138f3052031e56429 SHA1 205555e8c0b38e4231fa665bee5fc2a65b4ce634 SHA256 093be0506c6caf6b1055cf081b6578bd3bbfdf91ed933ef1dd4a57bf93191e22 +MISC ChangeLog 4181 RMD160 6c3a6a65571d7596428c62c0417b84752ec8e284 SHA1 651eb153eee5c50fe53d2cc57ec39da09d4d642e SHA256 7f82664c4fc48cd98f06fd2524c6c5dee3288fe7903dc4294b581e86de654837 MISC metadata.xml 410 RMD160 fc5c3713b57eb218772e99d188805578fc6a2093 SHA1 9bcbfce5d9db0ae81017d52481e219804a9d46a4 SHA256 8737e62a8eca3e0bb98d7ff14dcf38d1e7806c91d4263fa3e26bb50bbd76f22c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2l2X8ACgkQCaWpQKGI+9ToegCdGagXgsvhf6N+XmSqyBU5tUVr -AFAAn10moYAgvhVZ6PuFV9cZ555O77Q3 -=VrqT +iQIcBAEBAgAGBQJNqfHJAAoJENgZr6v6gHY0EBoQAIV+AP0noYvAWm4xwPBkgLOJ +UPiiEDGTdel6Uv0sBMK4hdrVDFsTBn7rrCSULo/RumL424fEXbvAngWPCNlIdY5a +RaKhyWiyO41FV+xvrTSpvLsjDumjT7QLO6XcHf1BFvoTSKElpP194mGcB2cPCMlq +L5dctIFOqJ5Z5vPS+9RoUEKbYIXSb2upQtcf+i8BB9tKspsBNcKRgrEi1ZVkToLw +IjIhd/A06bltiGQBWiShZhjuFTFI4/I7JHSC3wKFCb2BfOM2XOuYW184son1H9pN +Zm2Dmiv388woxT+EPMcWHYE5eRdQ6oCWD6n0VTmlSsl/btRR9FpPCChuIqOQKgR6 +2GrIw9YGWpdtPCqLiHX5o28gLQFOsol1GBSsvEtFJbcAK50XN4FO3SD8Up22ENck +WXu6kzLRSneoaIefmk9g0wwxhUDUCrvr3TmSyNP+26rkNqyv3N7uqqwUV1s/dFw2 +gTbCvnRw4aAGtA4xkyds4wjU8xY1ZDEOPSl9jTBzyeAK06Vh5AmRL9jJF/028gs6 +3zU+xyD+5nJ+9W9x3ApQ2iTg2Uys73zyEP3Gb6lgs1Q86QJ3mI+xODAKqJ16kUxU +lZJMmkzQIXJIdZm/+/eTe4wCmMGbFg+efrobnGcbz/zrJcOaJ52wtOOHH1p2XUVa +YXBZdlRT+J2SOfq+fM5D +=ffKu -----END PGP SIGNATURE----- diff --git a/app-cdr/serpentine/serpentine-0.9-r2.ebuild b/app-cdr/serpentine/serpentine-0.9-r2.ebuild index 1e0cc86c9782..c0dca4242be5 100644 --- a/app-cdr/serpentine/serpentine-0.9-r2.ebuild +++ b/app-cdr/serpentine/serpentine-0.9-r2.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/serpentine/serpentine-0.9-r2.ebuild,v 1.6 2011/04/13 17:12:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/serpentine/serpentine-0.9-r2.ebuild,v 1.7 2011/04/16 19:45:06 arfrever Exp $ +EAPI="3" GCONF_DEBUG=no +PYTHON_DEPEND="2" -inherit autotools eutils gnome2 mono multilib python +inherit autotools eutils gnome2 mono python DESCRIPTION="An application for writing CD-Audio discs. It aims for simplicity, usability and compability." HOMEPAGE="http://irrepupavel.com/projects/serpentine/" @@ -15,12 +17,11 @@ SLOT="0" KEYWORDS="~amd64 ppc x86" IUSE="muine" -RDEPEND=">=dev-lang/python-2.4 - >=dev-python/pygtk-2.6 +RDEPEND=">=dev-python/pygtk-2.6:2 >=dev-python/gst-python-0.10 dev-python/gconf-python dev-python/gnome-vfs-python - dev-python/pygobject + dev-python/pygobject:2 >=media-plugins/gst-plugins-gnomevfs-0.10 muine? ( media-sound/muine ) dev-python/pyxml" @@ -30,14 +31,14 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" pkg_setup() { + python_set_active_version 2 + python_pkg_setup + G2CONF="${G2CONF} $(use_enable muine)" DOCS="AUTHORS ChangeLog NEWS README TODO" } -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { echo serpentine/gtkutil.py >> po/POTFILES.skip echo serpentine/plugins/plugsuspend.py >> po/POTFILES.skip @@ -49,14 +50,16 @@ src_unpack() { intltoolize --force --copy --automake || die "intltoolize failed." eautoreconf + + python_convert_shebangs -r $(python_get_version) . } pkg_postinst() { gnome2_pkg_postinst - python_mod_optimize $(python_get_sitedir)/${PN} + python_mod_optimize ${PN} } pkg_postrm() { gnome2_pkg_postrm - python_mod_cleanup $(python_get_sitedir)/${PN} + python_mod_cleanup ${PN} } |