punt serpentine. long overdue and should have been punted already when USE hal was...
authorSamuli Suominen <ssuominen@gentoo.org>
Thu, 22 Dec 2011 13:16:54 +0000 (13:16 +0000)
committerSamuli Suominen <ssuominen@gentoo.org>
Thu, 22 Dec 2011 13:16:54 +0000 (13:16 +0000)
app-cdr/serpentine/ChangeLog [deleted file]
app-cdr/serpentine/Manifest [deleted file]
app-cdr/serpentine/files/serpentine-0.9-drop_pyxml.patch [deleted file]
app-cdr/serpentine/files/serpentine-0.9-python24_compat.patch [deleted file]
app-cdr/serpentine/metadata.xml [deleted file]
app-cdr/serpentine/serpentine-0.9-r2.ebuild [deleted file]

diff --git a/app-cdr/serpentine/ChangeLog b/app-cdr/serpentine/ChangeLog
deleted file mode 100644 (file)
index 4356feb..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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.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.
-
-  08 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  serpentine-0.9-r2.ebuild:
-  Delete call to deprecated python_version() (bug #308329).
-
-  29 Nov 2008; <ssuominen@gentoo.org> serpentine-0.9-r2.ebuild:
-  Add dev-python/pyxml dep. back, as our dev-python/4suite depends on it
-  anyway. Maybe it shouldn't.
-
-  20 Sep 2008; Tobias Scherbaum <dertobi123@gentoo.org>
-  serpentine-0.9-r2.ebuild:
-  ppc stable, bug #218112
-
-  06 Sep 2008; Petteri Räty <betelgeuse@gentoo.org> Manifest:
-  Fix Manifest.
-
-  24 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-  09 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
-  serpentine-0.9-r2.ebuild:
-  stable x86, bug 218112
-
-*serpentine-0.9-r2 (08 Jun 2008)
-
-  08 Jun 2008; Samuli Suominen <drac@gentoo.org> -serpentine-0.9-r1.ebuild,
-  +serpentine-0.9-r2.ebuild:
-  Revision bump with no changes so all users get eautoreconfed version.
-
-*serpentine-0.9-r1 (08 Jun 2008)
-
-  08 Jun 2008; Samuli Suominen <drac@gentoo.org>
-  +files/serpentine-0.9-drop_pyxml.patch,
-  +files/serpentine-0.9-python24_compat.patch, -serpentine-0.7.ebuild,
-  +serpentine-0.9-r1.ebuild:
-  Fix byte-compiling with Python 2.4 by not using exception handling from
-  2.5. Remove pyxml depend. Thanks to Peter Volkov wrt #218112, Comment #7.
-  Remove USE debug by passing GCONF_DEBUG=no into gnome2.eclass and fix
-  DESCRIPTION.toolong by removing word serpentine. Run eautoreconf because
-  we modify Makefile.am, and intltoolize to translation building failure.
-
-  05 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
-  serpentine-0.9.ebuild:
-  stable x86, bug 218112
-
-  04 Jun 2008; Samuli Suominen <drac@gentoo.org> serpentine-0.9.ebuild:
-  Fix test suite. Move use_enable inside function.
-
-*serpentine-0.9 (16 Dec 2007)
-
-  16 Dec 2007; Lars Weiler <pylon@gentoo.org> serpentine-0.7.ebuild,
-  +serpentine-0.9.ebuild:
-  Version bump; bug #201446.  Homepage-Change; bug #201447.
-
-  26 Feb 2007; Luis Medinas <metalgod@gentoo.org> -serpentine-0.6.4.ebuild:
-  Remove unused version fixes bug #167190.
-
-  21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
-  Transition to Manifest2.
-
-  22 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  serpentine-0.7.ebuild:
-  Added ~ppc, bug #140787
-
-  14 Jun 2006; Luis Medinas <metalgod@gentoo.org> -serpentine-0.6.3.ebuild,
-  -serpentine-0.6.91.ebuild, serpentine-0.7.ebuild:
-  Switch to gstreamer 0.10 since version 0.7 fully supports it. Closes bug
-  #136714. Removed older versions.
-
-*serpentine-0.7 (13 Jun 2006)
-
-  13 Jun 2006; Luis Medinas <metalgod@gentoo.org> +serpentine-0.7.ebuild:
-  Version Bump from upstream.
-
-*serpentine-0.6.91 (14 May 2006)
-
-  14 May 2006; Luis Medinas <metalgod@gentoo.org> +serpentine-0.6.91.ebuild:
-  Version Bump.
-
-  27 Feb 2006; Zaheer Abbas Merali <zaheerm@gentoo.org>
-  serpentine-0.6.3.ebuild, serpentine-0.6.4.ebuild:
-  fix deps
-
-  07 Nov 2005; Luis Medinas <metalgod@gentoo.org> serpentine-0.6.4.ebuild:
-  Add another missing dependency. See bug #111678.
-
-*serpentine-0.6.4 (31 Oct 2005)
-
-  31 Oct 2005; Luis Medinas <metalgod@gentoo.org> +serpentine-0.6.4.ebuild:
-  Version Bump.
-
-  01 Oct 2005; Luis Medinas <metalgod@gentoo.org> -serpentine-0.6.2.ebuild,
-  serpentine-0.6.3.ebuild:
-  Removed older version. Fixed dependencies.
-
-  19 Sep 2005; Luis Medinas <metalgod@gentoo.org> serpentine-0.6.3.ebuild:
-  Fixed dependency. Bug #106415.
-
-*serpentine-0.6.3 (17 Sep 2005)
-
-  17 Sep 2005; Luis Medinas <metalgod@gentoo.org> +serpentine-0.6.3.ebuild:
-  Version Bump
-
-*serpentine-0.6.2 (16 Sep 2005)
-
-  16 Sep 2005; Luis Medinas <metalgod@gentoo.org> +serpentine-0.6.2.ebuild:
-  New package. Thanks to all people involved in bug #90837.
-
diff --git a/app-cdr/serpentine/Manifest b/app-cdr/serpentine/Manifest
deleted file mode 100644 (file)
index f236725..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-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 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)
-
-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/files/serpentine-0.9-drop_pyxml.patch b/app-cdr/serpentine/files/serpentine-0.9-drop_pyxml.patch
deleted file mode 100644 (file)
index d79edc3..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-=== modified file 'Makefile.am'
---- Makefile.am        2007-08-13 15:30:11 +0000
-+++ Makefile.am        2008-03-07 16:05:24 +0000
-@@ -34,6 +34,7 @@
-       serpentine/common.py        \
-       serpentine/urlutil.py       \
-       serpentine/errors.py        \
-+      serpentine/compatxml.py     \
-       serpentine/release.py
- serpentine_pluginsdir = $(pythondir)/serpentine/plugins
-
-=== modified file 'serpentine/__init__.py'
---- serpentine/__init__.py     2007-10-15 10:55:52 +0000
-+++ serpentine/__init__.py     2008-03-07 16:05:24 +0000
-@@ -458,7 +458,7 @@
-         """
-         # Clean window object
-         Application.stop(self)
--        self.__window.destroy()
-+#        self.__window.destroy()
-         del self.__window
-         
-
-=== added file 'serpentine/compatxml.py'
---- serpentine/compatxml.py    1970-01-01 00:00:00 +0000
-+++ serpentine/compatxml.py    2008-03-07 16:05:24 +0000
-@@ -0,0 +1,29 @@
-+"""
-+Compability layer of XML.
-+"""
-+try:
-+      from Ft.Xml.Domlette import NonvalidatingReader
-+      parseUri = NonvalidatingReader.parseUri
-+        parseString = NonvalidatingReader.parseString
-+      del NonvalidatingReader
-+      from Ft.Xml.XPath import Evaluate
-+except ImportError:
-+      from xml.dom.minidom import parse as parseUri
-+      from xml.dom.minidom import parseString
-+      from xml.xpath import Evaluate
-+
-+def get_node_attr(node, attr):
-+      """
-+      Tries to uniform the way to get the *value* of an attribute in
-+      both minidom and in 4Suite.
-+      """
-+      try:
-+              return node.attributes[attr].value
-+      except KeyError:
-+              return node.attributes[(None, attr)].value
-+
-+def node_contains_attr(node, attr):
-+      """
-+      Uniforms the attributes in both minidom and in 4Suite.
-+      """
-+      return attr in node.attributes or (None, attr) in node.attributes
-
-=== modified file 'serpentine/plugins/plugfilter_k3b.py'
---- serpentine/plugins/plugfilter_k3b.py       2007-08-02 17:26:16 +0000
-+++ serpentine/plugins/plugfilter_k3b.py       2008-03-07 16:05:24 +0000
-@@ -21,8 +21,8 @@
- import zipfile, gnomevfs
--from xml.dom import minidom
--from xml.xpath import Evaluate
-+from serpentine.compatxml import parseString, Evaluate, get_node_attr
-+
- from xml.parsers.expat import ExpatError
- from serpentine.mastering import HintsFilter
-@@ -70,7 +70,7 @@
-         try:
-             zfile = zipfile.ZipFile(fd)
-             buff = zfile.read("maindata.xml")
--            root = minidom.parseString(buff)
-+            root = parseString(buff)
-             
-         except (zipfile.BadZipfile, IOError, KeyError, ExpatError):
-             raise UnsupportedLocationError()
-@@ -81,7 +81,7 @@
-         hints_list = []
-         for node in Evaluate ("/k3b_audio_project/contents/track", root):
-             try:
--                hints_list.append ({"location": node.attributes["url"].value})
-+                hints_list.append ({"location": get_node_attr(node, "url")})
-             except KeyError:
-                 # skip elements without the 'url' attribute set
-                 pass
-@@ -92,9 +92,8 @@
-         for node in Evaluate ("/k3b_audio_project/contents/track/sources/file",
-                               root):
-             try:
--                hints_list.append ({"location": node.attributes["url"].value})
-+                hints_list.append ({"location": get_node_attr(node, "url")})
-             except KeyError:
--                # skip elements with not 'url' attribute set
-                 pass
-         return hints_list
-
-=== modified file 'serpentine/plugins/plugrhythmbox.py'
---- serpentine/plugins/plugrhythmbox.py        2007-08-14 08:43:07 +0000
-+++ serpentine/plugins/plugrhythmbox.py        2008-03-07 16:05:24 +0000
-@@ -3,8 +3,8 @@
- import os.path
- import weakref
--from xml.xpath import Evaluate
--from xml.dom import minidom
-+from serpentine.compatxml import Evaluate, parseUri, get_node_attr, node_contains_attr
-+
- from gettext import gettext as _
- if __name__ == '__main__':
-@@ -20,17 +20,17 @@
- def rhythmbox_list_names():
-     try:
--        root = minidom.parse(PLAYLISTS)
-+        root = parseUri(PLAYLISTS)
-     except IOError:
-         return ()
-     
-     nodes = Evaluate("/rhythmdb-playlists/playlist", root)
--    return [node.attributes["name"].value for node in nodes]
-+    return [get_node_attr(node, "name") for node in nodes if node_contains_attr(node, "name")]
- def rhythmbox_get_playlist(playlist_name):
-     try:
--        root = minidom.parse(PLAYLISTS)
-+        root = parseUri(PLAYLISTS)
-     except IOError:
-         return ()
-     
-
-=== modified file 'serpentine/xspf.py'
---- serpentine/xspf.py 2007-08-02 17:20:48 +0000
-+++ serpentine/xspf.py 2008-03-07 16:05:24 +0000
-@@ -23,8 +23,8 @@
- This is a very simple utility module for retrieving basic XSPF playlist data.
- Basically it retrieves the playlist tracks' title, artist, location and duration.
- """
--from xml.dom import minidom
--from xml.xpath import Evaluate
-+
-+from serpentine.compatxml import parseUri, Evaluate
- from xml.dom.minidom import getDOMImplementation
- class _Field(object):
-@@ -121,7 +121,8 @@
-               return doc
-       def parse (self, file_or_filename):
--              root = minidom.parse (file_or_filename)
-+              #root = minidom.parse (file_or_filename)
-+              root = parseUri(file_or_filename)
-               # Iterate over tracks
-               for track_node in Evaluate ("/playlist/trackList/track", root):
-                       t = Track()
-
diff --git a/app-cdr/serpentine/files/serpentine-0.9-python24_compat.patch b/app-cdr/serpentine/files/serpentine-0.9-python24_compat.patch
deleted file mode 100644 (file)
index aa0378b..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur serpentine-0.9/serpentine/plugins/plugfilter_k3b.py serpentine-0.9.new/serpentine/plugins/plugfilter_k3b.py
---- serpentine-0.9/serpentine/plugins/plugfilter_k3b.py        2008-03-14 22:42:19.000000000 +0000
-+++ serpentine-0.9.new/serpentine/plugins/plugfilter_k3b.py    2008-03-14 22:43:08.000000000 +0000
-@@ -68,12 +68,13 @@
-             
-         try:
--            zfile = zipfile.ZipFile(fd)
--            buff = zfile.read("maindata.xml")
--            root = parseString(buff)
-+            try:
-+                zfile = zipfile.ZipFile(fd)
-+                buff = zfile.read("maindata.xml")
-+                root = parseString(buff)
-             
--        except (zipfile.BadZipfile, IOError, KeyError, ExpatError):
--            raise UnsupportedLocationError()
-+            except (zipfile.BadZipfile, IOError, KeyError, ExpatError):
-+                raise UnsupportedLocationError()
-         finally:
-             fd.close()
-         
diff --git a/app-cdr/serpentine/metadata.xml b/app-cdr/serpentine/metadata.xml
deleted file mode 100644 (file)
index c8135bc..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>media-optical</herd>
-<longdescription lang="en">
-Serpentine is an application for writing CD-Audio discs. It aims for simplicity,
-usability and compability.
-</longdescription>
-<use>
-       <flag name='muine'>Enable support for the GNOME music player Muine</flag>
-</use>
-</pkgmetadata>
-
diff --git a/app-cdr/serpentine/serpentine-0.9-r2.ebuild b/app-cdr/serpentine/serpentine-0.9-r2.ebuild
deleted file mode 100644 (file)
index c0dca42..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.7 2011/04/16 19:45:06 arfrever Exp $
-
-EAPI="3"
-GCONF_DEBUG=no
-PYTHON_DEPEND="2"
-
-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/"
-SRC_URI="mirror://berlios/serpentine/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="muine"
-
-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:2
-       >=media-plugins/gst-plugins-gnomevfs-0.10
-       muine? ( media-sound/muine )
-       dev-python/pyxml"
-DEPEND="${RDEPEND}
-       sys-devel/gettext
-       dev-util/intltool
-       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_prepare() {
-       echo serpentine/gtkutil.py >> po/POTFILES.skip
-       echo serpentine/plugins/plugsuspend.py >> po/POTFILES.skip
-
-       epatch "${FILESDIR}"/${P}-drop_pyxml.patch \
-               "${FILESDIR}"/${P}-python24_compat.patch
-
-       rm -f py-compile || die "rm failed."
-       ln -s $(type -P true) py-compile || die "ln failed."
-
-       intltoolize --force --copy --automake || die "intltoolize failed."
-       eautoreconf
-
-       python_convert_shebangs -r $(python_get_version) .
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-       python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-       gnome2_pkg_postrm
-       python_mod_cleanup ${PN}
-}