Version cleanup

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 5 insertions, 141 deletions

diff --git a/rox-base/zeroinstall-injector/ChangeLog b/rox-base/zeroinstall-injector/ChangeLog
index e0ec238dc873..3047f1d7482d 100644
--- a/rox-base/zeroinstall-injector/ChangeLog
+++ b/rox-base/zeroinstall-injector/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-base/zeroinstall-injector
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/zeroinstall-injector/ChangeLog,v 1.19 2010/01/12 13:33:58 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/zeroinstall-injector/ChangeLog,v 1.20 2010/03/31 12:53:22 lack Exp $
+
+  31 Mar 2010; Jim Ramsay <lack@gentoo.org> -files/0distutils,
+  -zeroinstall-injector-0.33.ebuild:
+  Version cleanup
 
 *zeroinstall-injector-0.43 (12 Jan 2010)
 
diff --git a/rox-base/zeroinstall-injector/files/0distutils b/rox-base/zeroinstall-injector/files/0distutils
deleted file mode 100755
index 91e4d5deabfd..000000000000
--- a/rox-base/zeroinstall-injector/files/0distutils
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/python
-
-from xml.dom import minidom
-import xml.dom
-
-def escape(uri):
-	import zeroinstall.injector.model
-	return zeroinstall.injector.model._pretty_escape(uri)
-
-def cacheescape(uri):
-	import zeroinstall.injector.model
-	return zeroinstall.injector.model.escape(uri)
-
-def strip(node):
-	torm = []
-	for c in node.childNodes:
-		if c.nodeType == xml.dom.Node.TEXT_NODE and \
-		   c.nodeValue.strip() == "":
-			torm.append(c)
-		elif c.hasChildNodes():
-			strip(c)
-	for c in torm:
-		node.removeChild(c)
-		c.unlink()
-
-class LocalFeed(object):
-	def __init__(self, xmlfile):
-		self.xml = minidom.parse(xmlfile)
-		if self.xml.documentElement.nodeName != "interface":
-			raise TypeError("Not an interface")
-		strip(self.xml.documentElement)
-	
-	def getUri(self):
-		for element in self.xml.documentElement.getElementsByTagName("feed-for"):
-			if element.hasAttribute("interface"):
-				return element.getAttribute("interface")
-		return None
-
-	def edit(self, id=".", main="AppRun", stability="packaged"):
-		for attribute in ("main", "uri"):
-			if self.xml.documentElement.hasAttribute(attribute):
-				self.xml.documentElement.removeAttribute(attribute)
-		for group in self.xml.documentElement.getElementsByTagName("group"):
-			group.setAttribute("main", "AppRun")
-			for imp in group.getElementsByTagName("implementation"):
-				imp.setAttribute("stability",stability)
-				imp.setAttribute("id",id)
-
-	def dump(self):
-		print self.xml.toprettyxml()
-
-def main(xmlfile, mode="edit"):
-	try:
-		feed = LocalFeed(xmlfile)
-		if mode == "uri":
-			print feed.getUri()
-		elif mode == "escape":
-			print escape(feed.getUri())
-		elif mode == "cache":
-			print cacheescape(feed.getUri())
-		else:
-			feed.edit()
-			feed.dump()
-	except Exception, e:
-		import sys
-		print "Fatal:", e
-		sys.exit(2)
-
-def usage(program):
-	import os.path
-	progname = os.path.basename(program)
-	print "Usage:", progname, "[-u|-e] <xmlfile>"
-	print "Options:"
-	print "\t-u --uri:    Finds the URI from the feed"
-	print "\t-e --escape: Escapes the URI from the feed"
-
-if __name__ == "__main__":
-	from optparse import OptionParser
-	import sys
-	parser = OptionParser(usage="usage: %prog [options] feed.xml",
-		description="By default, edits the given feed and prints the result on stdout.")
-	parser.add_option("-e", "--escape", action="store_const",
-		const="escape", dest="mode",
-		help="Return the cache-escaped URI from the feed on stdout.")
-	parser.add_option("-c", "--cache", action="store_const",
-		const="cache", dest="mode",
-		help="Return the file-escaped URI from the feed on stdout.")
-	parser.add_option("-u", "--uri", action="store_const",
-		const="uri", dest="mode",
-		help="Return the original URI from the feed on stdout.")
-	(options, args) = parser.parse_args()
-	if len(args) == 0:
-		parser.print_help()
-	else:
-		if len(args) > 1:
-			parser.error("requires exactly one .xml file")
-		main(args[0], options.mode)
diff --git a/rox-base/zeroinstall-injector/zeroinstall-injector-0.33.ebuild b/rox-base/zeroinstall-injector/zeroinstall-injector-0.33.ebuild
deleted file mode 100644
index 2371062baf69..000000000000
--- a/rox-base/zeroinstall-injector/zeroinstall-injector-0.33.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/zeroinstall-injector/zeroinstall-injector-0.33.ebuild,v 1.6 2009/04/09 13:34:38 lack Exp $
-
-inherit distutils
-
-DESCRIPTION="Zeroinstall Injector allows regular users to install software themselves"
-HOMEPAGE="http://0install.net/"
-SRC_URI="mirror://sourceforge/zero-install/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="!<=rox-base/rox-session-0.30"
-RDEPEND=">=dev-python/pygtk-2.0
-	app-crypt/gnupg"
-
-PYTHON_MODNAME="zeroinstall"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Change manpage install path (Bug 207495)
-	sed -i 's:man/man1:share/man/man1:' setup.py
-}
-
-src_install() {
-	distutils_src_install
-
-	exeinto "/usr/sbin/"
-	doexe "${FILESDIR}/0distutils"
-
-	local BASE_XDG_CONFIG="/etc/xdg/0install.net"
-	local BASE_XDG_DATA="/usr/share/0install.net"
-
-	insinto "${BASE_XDG_CONFIG}/injector"
-	newins "${FILESDIR}/global.cfg" global
-
-	dodir "${BASE_XDG_DATA}/native_feeds"
-}