From: Jim Ramsay Date: Wed, 31 Mar 2010 12:53:22 +0000 (+0000) Subject: Version cleanup X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5f018725442b4d18965c6c69bcbe02de326ff6f;p=gentoo.git Version cleanup Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- 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 -files/0distutils, + -zeroinstall-injector-0.33.ebuild: + Version cleanup *zeroinstall-injector-0.43 (12 Jan 2010) diff --git a/rox-base/zeroinstall-injector/Manifest b/rox-base/zeroinstall-injector/Manifest index 079f84750b25..f51c47d4304f 100644 --- a/rox-base/zeroinstall-injector/Manifest +++ b/rox-base/zeroinstall-injector/Manifest @@ -1,11 +1,8 @@ -AUX 0distutils 2877 RMD160 d776f049967c5b2d73148a24e27a3395a71a3602 SHA1 9662f2b10c6c8166a5cfb35e0f874e832499bb94 SHA256 2e8fae99c0dccdba237e403fe98b9f9f57197c1a119010f804361619b4e5f9c7 AUX 0distutils-r1 3523 RMD160 4f0b2ce58bb6bd8b572cf89e5ef1dc444812eb4b SHA1 d9b8605e5dfaa221e8bc24e62d5d92f88baca2df SHA256 06b41367607d6f60ee5d895ac3e26744b9337254fa3d740aa952a325bc22bcd5 AUX global.cfg 74 RMD160 bb2aa8c35d498342388c7e280c303f9869f9e6a3 SHA1 5ad6042f6fd113062ff347bdff563108927a20b6 SHA256 00e469a631692d515af084f43e9d854ae0ae4fa7a312b61a3050d4fb5caf6f47 -DIST zeroinstall-injector-0.33.tar.bz2 130726 RMD160 45f1c76fc67bb701021a5186feb494b8276b4c3c SHA1 80a2c607076b9c35113f7da862d49aec31633770 SHA256 aa5f2370cde5e4654424df6f9595d899b9eaba9f79654dfd8852bdba2c5e5eb2 DIST zeroinstall-injector-0.40.tar.bz2 150082 RMD160 6cc84fb16a33e7a9a24442ad2e92da0d531caf2d SHA1 d0e4c159ab9efdaa3938b37465dc7f8ac08141ac SHA256 89b0aacc07450884866cee21651779d3b5bcc9546c6ea65d72a77b181daef042 DIST zeroinstall-injector-0.43.tar.bz2 187129 RMD160 a1781dd6853c29a0651ebdf3874ae5f274b791d7 SHA1 12f638d19db4a917f1c3327a9c770beaf1bfe366 SHA256 571f2cd8df67bd8c0408bef36fb8cf272a08495c8ab0bafd85ba5b464a8e984d -EBUILD zeroinstall-injector-0.33.ebuild 1073 RMD160 201ea0f7564efb8cefca534372d26469787fb806 SHA1 ac4277b6de5273a33ff406bb1764b3cbe5e38ec3 SHA256 3dd95bb50b4139bf0d4f6189bc4fd57035710304569eabf367aa9db2166545a6 EBUILD zeroinstall-injector-0.40.ebuild 1308 RMD160 224f8f4b730a336f20fab82af4566c80a27efed3 SHA1 5a8db82ed8b806760ffe318d8d668a6480f5a017 SHA256 3567c5ccd5a796b27e3ebe5ea40423b49aa4022acd1488100a9d4bb47f27f415 EBUILD zeroinstall-injector-0.43.ebuild 1311 RMD160 74043f30374bee87d22f37ebc6a7b1bef363e685 SHA1 bc1b7fcc45053ebf4c799b8a4190f1f794e843c9 SHA256 c8dc5866767728904ef1c671d617e83cd3dac53379d1e87e8671103be9f27de5 -MISC ChangeLog 3064 RMD160 de5b67e562b34c824ff9df673e662e1b01604a66 SHA1 f029d0b21fb5a32e9a03851d7eeb5750fd587edf SHA256 d238fef2e26aa89bf131ee07f6bd5cf0c2db56b21697e8682c380461708e0670 +MISC ChangeLog 3183 RMD160 4537c7a411de860b9682672e3a2e1439740cfa28 SHA1 06ab5e3ce0b2be145af8b4e12703d8381e316e04 SHA256 51fe717722dc2b7d4c46b9a64f76533190361b14cb5234ebc96997db5cf2ebf7 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c 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] " - 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" -}