From 27dfd272ae3be15b1017f733682211afa1c7c0f0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 2 Nov 2017 21:07:25 +0000 Subject: gentoo resync : 02.11.2017 --- app-dicts/gnome-dictionary/Manifest | 2 - .../gnome-dictionary-3.18.1.ebuild | 41 ------ app-dicts/opendict/Manifest | 3 - .../opendict/files/opendict-0.6.3-pyxml.patch | 144 --------------------- app-dicts/opendict/opendict-0.6.3-r1.ebuild | 91 ------------- 5 files changed, 281 deletions(-) delete mode 100644 app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild delete mode 100644 app-dicts/opendict/files/opendict-0.6.3-pyxml.patch delete mode 100644 app-dicts/opendict/opendict-0.6.3-r1.ebuild (limited to 'app-dicts') diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest index 80b4f0a033ac..7de1c24d906c 100644 --- a/app-dicts/gnome-dictionary/Manifest +++ b/app-dicts/gnome-dictionary/Manifest @@ -1,7 +1,5 @@ -DIST gnome-dictionary-3.18.1.tar.xz 864460 SHA256 92cf2d519335b125018468c22405499fdb320e4446201c7b0f55f1a441bf05cc SHA512 efe4d1f8810bf218bae4d393be1d26938ed3a814ed22fb96c0bded5f874c32229b215351b08462eef1c92b756640a3d4e1c0f5ea1ee49f67e519bcf0d53aba74 WHIRLPOOL c20c73504e8ce0745170ec21296191d14770f252c80b208e4ac08659f80d2ece79cd2d408b4e3bdee992475a67be2ec77f4c16e501e8bbbebe8c0a95c3911e7b DIST gnome-dictionary-3.20.0.tar.xz 871916 SHA256 efb36377d46eff9291d3b8fec37baab2355f9dc8bc7edb791b6a625574716121 SHA512 9be2564b5bf543e80afdb946c16b16e2daf6c31875e352b7c2d7e34436791fc9470eadb42eba3a4c1893e2f2568e6bb88d19ea4a0b8dbb2eca2dd4c95aeaf229 WHIRLPOOL 4c22c0b2f7f668f5efc3857ba4bf33808d52a524b4d8ccbe1ac91839daff97d7271cf5f8196c0fbaa47266bb83f9f0705c83d1fe5949f633bfa50269554e057f DIST gnome-dictionary-3.24.0.tar.xz 878756 SHA256 41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2 SHA512 1c31149b02978a1840563941767e3ce2be4f6a5e790eb9126c0f0c50d932987f46447fe3bac0e2eb8ce87be1521d13e56d8a14e86407e367a6dd76cd5a77de30 WHIRLPOOL 3daf0e1efcf0783e6ad0d97877ff41037df0c257f60e95920d7dd1948a0f1c495964ee96497c826814d2e5a77a350da5eb0e5b6a49127065abd1264490f35010 -EBUILD gnome-dictionary-3.18.1.ebuild 1003 SHA256 f9c202086e25eb1455526ee43a1fc441cf50f56bd29c2237be08f544278499c1 SHA512 9cea899e525aaac6eb847dfa42847ff3ce0387de14cbbf229c9e3421e7c6e8c2da0df944500d4f2b827b5cb3c228a1740193e77dfefae016b7745bd270a9f34e WHIRLPOOL 5b8ddd84c78dad4c59a0bf5d5ba389555acef39be65ce88e2b7ecc8837a88f2c702ee2a20b8fdec1e47c9850b76a71f5259d0b715c4165ad73b92644b92d7658 EBUILD gnome-dictionary-3.20.0.ebuild 1030 SHA256 653dc37b26dfd1da5a2a4238efefd0ca95e27b2bff30da02f85396d086d550e7 SHA512 a8ea676441356eb5ffd912efaafcff2f4d50fcf8b2dee05b529ff86d9f3fb3db73e4aefb2d5f6fa875c10c840bb6318d8484140cb6f3100d450b8cf4509386e9 WHIRLPOOL 18da967a98b48e80823b5cc63b8818736bf200c4169e1c7eebba16df4e1155ebd36ed8aeedb8a450b7f2405cd7be6fef8fe44d091399437c6a2d78258815f1d3 EBUILD gnome-dictionary-3.24.0.ebuild 1034 SHA256 d7a606b88a477f090dc6a6278dba805a6f2af3833544ccb1c02f2f18be60e1be SHA512 290457aea7645de74718303621508627c8efd80892216c63bce1579633fb1a0be0616c185fbf86124ba7dc38c39c44ae0b6e8ebf230f160735517228017a16b4 WHIRLPOOL 2ee4a7caf799343439358c3589eaa8e51c45a9a4cb71b0134f3a824b9b3f5d2a725299ddbd78ed79c204cc2f997ff2df2d48bcb361f02f625e35b8cfc8317cc0 MISC ChangeLog 4612 SHA256 10a988500036f34260a2556aaa4c9d10b2ba8e25760090bf484cfa2be28c79d7 SHA512 8f2b42234b42f692c674b2727609de1195cc790d850ec1fefe527490302dbcfcda360255e8041011304a5ce40a537ceb71aa7980c8a05a1239ddc6109f3367cb WHIRLPOOL cc52869aa19d368b05120ff0268f2ffde8ebf5e56b2ff54b50340a34e08c5db0771abda040a192bac51b2f9c40f3d02aa4e440bcd20515e153b0cbf658045e86 diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild deleted file mode 100644 index 5204d4359db9..000000000000 --- a/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="yes" - -inherit gnome2 - -DESCRIPTION="Dictionary utility for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary" - -LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" -SLOT="0/9" # subslot = suffix of libgdict-1.0.so -IUSE="+introspection ipv6" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" - -COMMON_DEPEND=" - >=dev-libs/glib-2.39:2[dbus] - x11-libs/cairo:= - >=x11-libs/gtk+-3.14:3 - x11-libs/pango - introspection? ( >=dev-libs/gobject-introspection-1.42:= ) -" -RDEPEND="${COMMON_DEPEND} - gnome-base/gsettings-desktop-schemas - != 2.3 -- - wxPython 2.6 -- - python-xml (PyXML) -+ - Python >= 2.4 -+ - wxPython >= 2.6 - - gettext >= 0.14 - - ---- a/lib/xmltools.py -+++ b/lib/xmltools.py -@@ -20,7 +20,6 @@ - # - - import xml.dom.minidom --import xml.dom.ext - - from lib import meta - -@@ -30,7 +29,7 @@ def _textData(element): - - text = '' - for node in element.childNodes: -- text = node.data -+ text = node.data.strip() - - return text - -@@ -99,7 +98,7 @@ class RegisterConfigGenerator: - or '')) - - return doc -- -+ - - def generatePlainDictConfig(**args): - """Generate configuration and return DOM object""" -@@ -113,10 +112,11 @@ def generatePlainDictConfig(**args): - def writePlainDictConfig(doc, path): - """Write XML file""" - -- fd = open(path, 'w') -- xml.dom.ext.PrettyPrint(doc, fd) -+ import codecs -+ fd = codecs.open(path, 'w', 'utf-8') -+ doc.writexml(fd, addindent = " ", newl = "\n", encoding = "UTF-8") - fd.close() -- -+ - - - class RegisterConfigParser: -@@ -144,32 +144,32 @@ class RegisterConfigParser: - - for nameElement in registerElement.getElementsByTagName('name'): - for node in nameElement.childNodes: -- name = node.data -+ name = node.data.strip() - - for formatElement in registerElement.getElementsByTagName('format'): - for node in formatElement.childNodes: -- format = node.data -+ format = node.data.strip() - - for pathElement in registerElement.getElementsByTagName('path'): - for node in pathElement.childNodes: -- path = node.data -+ path = node.data.strip() - - for versionElement in registerElement.getElementsByTagName('version'): - for node in versionElement.childNodes: - version = node.data.strip() - - for authorElement in registerElement.getElementsByTagName('author'): -- authors.append({'name': authorElement.getAttribute('name'), -- 'email': authorElement.getAttribute('email')}) -+ authors.append({'name': authorElement.getAttribute('name').strip(), -+ 'email': authorElement.getAttribute('email').strip()}) - - for md5Element in registerElement.getElementsByTagName('md5'): - for node in md5Element.childNodes: -- md5 = node.data -+ md5 = node.data.strip() - - for encodingElement in \ - registerElement.getElementsByTagName('encoding'): - for node in encodingElement.childNodes: -- encoding = node.data -+ encoding = node.data.strip() - - for licenceElement in \ - registerElement.getElementsByTagName('licence'): -@@ -241,8 +241,9 @@ def generateIndexFile(index): - def writeIndexFile(doc, path): - """Write XML file""" - -- fd = open(path, 'wb') -- xml.dom.ext.PrettyPrint(doc, fd) -+ import codecs -+ fd = codecs.open(path, 'wb', 'utf-8') -+ doc.writexml(fd, addindent = " ", newl = "\n", encoding = "UTF-8") - fd.close() - - -@@ -511,7 +512,8 @@ def generateMainConfig(props): - def writeConfig(doc, path): - """Write XML file""" - -- fd = open(path, 'w') -- xml.dom.ext.PrettyPrint(doc, fd) -+ import codecs -+ fd = codecs.open(path, 'w', 'utf-8') -+ doc.writexml(fd, addindent = " ", newl = "\n", encoding = "UTF-8") - fd.close() - ---- a/opendict.py -+++ b/opendict.py -@@ -53,16 +53,6 @@ except ImportError: - print >> sys.stderr, "**" - sys.exit(1) - -- --try: -- import xml.dom.ext --except ImportError: -- print >> sys.stderr, "**" -- print >> sys.stderr, "** Error: Python/XML library not found" -- print >> sys.stderr, "** Please install python-xml (PyXML) to run OpenDict" -- print >> sys.stderr, "**" -- sys.exit(1) -- - # get_main_dir() returns the directory name of the script or the - # directory name of the exe - def get_main_dir(): diff --git a/app-dicts/opendict/opendict-0.6.3-r1.ebuild b/app-dicts/opendict/opendict-0.6.3-r1.ebuild deleted file mode 100644 index abb4dbf2ad13..000000000000 --- a/app-dicts/opendict/opendict-0.6.3-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="no" # We skip gnome2_src_configure entirely -PYTHON_COMPAT=( python2_7 ) - -inherit eutils gnome2 python-single-r1 readme.gentoo - -DESCRIPTION="OpenDict is a free cross-platform dictionary program" -HOMEPAGE="http://opendict.sourceforge.net/" -SRC_URI="http://opendict.idiles.com/files/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-python/wxpython:2.8[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="If you want system-wide plugins, unzip them into -${ROOT}usr/share/${PN}/dictionaries/plugins - -Some are available from http://opendict.sourceforge.net/?cid=3" - -src_prepare() { - epatch "${FILESDIR}"/${P}-pyxml.patch - - sed -e "s:), '..')):), '../../../../..', 'share', 'opendict')):g" \ - -i "${S}/lib/info.py" - - gnome2_src_prepare -} - -src_configure() { - # override gnome2_src_configure - default -} - -src_compile() { - # evil makefile - : -} - -src_install() { - # makefile is broken, do it manually - - dodir /usr/share/${PN}/dictionaries/plugins # global dictionary plugins folder - - # Needed by GUI - insinto /usr/share/${PN} - doins "${S}"/copying.html - - insinto /usr/share/${PN}/pixmaps - doins "${S}"/pixmaps/* - - DHOME="$(python_get_sitedir)/opendict" - insinto "${DHOME}/lib" - doins -r "${S}"/lib/* - exeinto "${DHOME}" - python_fix_shebang opendict.py - doexe opendict.py - - dosym "${DHOME}/opendict.py" /usr/bin/opendict - - domenu misc/${PN}.desktop - - insinto /usr/share/icons/hicolor/24x24/apps/ - newins "${S}/pixmaps/icon-24x24.png" opendict.png - insinto /usr/share/icons/hicolor/32x32/apps/ - newins "${S}/pixmaps/icon-32x32.png" opendict.png - insinto /usr/share/icons/hicolor/48x48/apps/ - newins "${S}/pixmaps/icon-48x48.png" opendict.png - insinto /usr/share/icons/hicolor/scalable/apps/ - newins "${S}/pixmaps/SVG/icon-rune.svg" opendict.svg - - doman opendict.1 - dodoc README.txt TODO.txt doc/Plugin-HOWTO.html - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - readme.gentoo_print_elog -} -- cgit v1.2.3