From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- net-im/pyicq-t/Manifest | 7 -- net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 | 23 ---- .../files/pyicq-t-0.8.1.5-pillow-imaging.patch | 36 ------- .../files/pyicq-t-0.8.1.5-python26-warnings.diff | 118 --------------------- net-im/pyicq-t/files/pyicq-t.service | 10 -- net-im/pyicq-t/metadata.xml | 13 --- net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild | 58 ---------- 7 files changed, 265 deletions(-) delete mode 100644 net-im/pyicq-t/Manifest delete mode 100644 net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 delete mode 100644 net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch delete mode 100644 net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff delete mode 100644 net-im/pyicq-t/files/pyicq-t.service delete mode 100644 net-im/pyicq-t/metadata.xml delete mode 100644 net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild (limited to 'net-im/pyicq-t') diff --git a/net-im/pyicq-t/Manifest b/net-im/pyicq-t/Manifest deleted file mode 100644 index 7bdb64cda20e..000000000000 --- a/net-im/pyicq-t/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX pyicq-t-0.8-initd-r1 606 BLAKE2B f5585a9abb6129e57fa2c30cf4203fad985a351fa3dace7fd9147588e7f10062b2d7e0f3bd1ec2ec08f9826612f9c7364d90a02205c6a4accd35dada6c484785 SHA512 f8563a7ec081ecbef2f40f7c923ceb43b6abe0ff016df57540fedf3feeff1e06f19fa777324ae97937c46c85344db25ffa7097d259c0e2f4c6bad9b7eaf30971 -AUX pyicq-t-0.8.1.5-pillow-imaging.patch 1236 BLAKE2B f394b84f530fc01ddc87ec3e9f2ec13d6f6dd902d2692e0d922a51170f13d8c423ac45198d5b3474c32c6db04b39c23ba13ff4ebc2753a049b22cfae48b98281 SHA512 e7e454493286e02e525cdc6d8b63fbb102eca0f242f046ec30f7541ff1a9579b43bad2250d34a7049d06c9958e4d93304d5f873b84cf2af6fbcaef726a8a5d5b -AUX pyicq-t-0.8.1.5-python26-warnings.diff 3485 BLAKE2B edf98d20ea41bed32b3c4952c24f133a6d02a073402d0032140195fc9772eb85421ed202a72813922f61001d4c56e34fee38cc49701e646e1992961cb8e0f3ed SHA512 8b7cb353ff2c6259525909b62a6d552116339fe8489d747f7310fa9013011b6028c0f0dc165307ff5b9fe9da9517852c3e4158eb6f05a51f987e9cf2a969b949 -AUX pyicq-t.service 223 BLAKE2B 3f323776d36115207e5bd81f16c7c47b438bab74772cbcc3cabb5acb7ab992b0cb8edc6b76def436a9d65685d232754d988cb2c7dcecdc8bc5a2152cfdd0ceb7 SHA512 e1df68340f54bc6568308fefcc723323358c27b143cd3258f451ebf06e5f6ac0a7b66d7567543212e5924144164e0d9a2121fb96fa2721b234399a19127850c6 -DIST pyicqt-0.8.1.5.tar.gz 183865 BLAKE2B 5f0cce6fd9d27cf60f6234870644c95e016bc979a167d48a331df47cb25eefca96ed0082d336c931a6af5f25babaa7fdffc0cafdb0374463c066d5c185b02059 SHA512 5b83adf86746c2af60bed2759c7d4e3a3839bea532e0882a6dc087aee5e0afa1320c6d2d2296a667ec45c5b36be879034f079fd30cef924e8db5f66a2f1d3fde -EBUILD pyicq-t-0.8.1.5-r7.ebuild 1643 BLAKE2B 412e7f65d05a3eb66181db512a82f457fd51985dda6fe06255e7a226ca7a9d84058c8fa87c5e04dbdbd1f837b28748306849c5e64e37eca529ddb4f47bf98207 SHA512 10498348e90a090e5ee1bb8d6de21e25a0b63be3d223fcdaff9a179b9ecadecf3e2dd09a62a85f7557d8915cfe41634543c47d70c7d507a225df79dfa6061ef1 -MISC metadata.xml 419 BLAKE2B 89f7918635ee4ead843dee7a7b031eefc427b5df2c5edb25a3b891e21046ac346386a1270d69820594cd23957bab8690d0c55246696ffb204d8fe636ae097dfb SHA512 1f30a23054f9f867a94d7e899f5be0780b08cf070c9a2831a34f4fbafe03e19dc9fedb023d3825411104a7322e0d0c8b6928a4f30794511371dd9ec7ea2e339f diff --git a/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 b/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 deleted file mode 100644 index eda03d55077e..000000000000 --- a/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net - use jabber-server -} - -start() { - ebegin "Starting ICQ Jabber Transport" - checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/ - start-stop-daemon --start --pidfile /var/run/jabber/pyicq-t.pid -u jabber -g jabber \ - --exec INSPATH/pyicq-t.py -- \ - -b -c /etc/jabber/pyicq-t.xml -l /var/log/jabber/pyicq-t.log - eend $? -} - -stop() { - ebegin "Stopping ICQ Jabber Transport" - start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyicq-t.pid - eend $? -} diff --git a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch deleted file mode 100644 index 62df75873c08..000000000000 --- a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur pyicqt-0.8.1.5/src/contact.py pyicqt-0.8.1.5-1/src/contact.py ---- pyicqt-0.8.1.5/src/contact.py 2009-08-24 14:37:59.000000000 +0200 -+++ pyicqt-0.8.1.5-1/src/contact.py 2013-09-11 22:19:01.320467367 +0200 -@@ -13,7 +13,7 @@ - import globals - import base64 - if not config.disableAvatars: -- import Image -+ import PIL.Image as Image - import StringIO - - -diff -Naur pyicqt-0.8.1.5/src/imgmanip.py pyicqt-0.8.1.5-1/src/imgmanip.py ---- pyicqt-0.8.1.5/src/imgmanip.py 2009-08-24 14:37:59.000000000 +0200 -+++ pyicqt-0.8.1.5-1/src/imgmanip.py 2013-09-11 22:19:25.257168117 +0200 -@@ -5,7 +5,7 @@ - - if not config.disableAvatars: - try: -- import Image -+ import PIL.Image as Image - import StringIO - - def convertToPNG(imageData): -diff -Naur pyicqt-0.8.1.5/tools/infodump.py pyicqt-0.8.1.5-1/tools/infodump.py ---- pyicqt-0.8.1.5/tools/infodump.py 2009-08-24 14:37:59.000000000 +0200 -+++ pyicqt-0.8.1.5-1/tools/infodump.py 2013-09-11 22:18:34.084807860 +0200 -@@ -41,7 +41,7 @@ - print "Nevow Version: Unknown or Not Installed" - - try: -- from Image import VERSION -+ from PIL.Image import VERSION - print "Python Imaging Library (PIL) Version: " + VERSION - except: - print "Python Imaging Library (PIL) Version: Unknown or Not Installed" diff --git a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff deleted file mode 100644 index fd8e9e5ab8f0..000000000000 --- a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff +++ /dev/null @@ -1,118 +0,0 @@ -diff -Naur pyicqt-0.8.1.5/src/avatar.py p1//src/avatar.py ---- pyicqt-0.8.1.5/src/avatar.py 2010-06-07 12:16:36.000000000 +0200 -+++ p1//src/avatar.py 2010-06-07 12:16:16.000000000 +0200 -@@ -6,7 +6,7 @@ - from twisted.words.xish.domish import Element - from debug import LogEvent, INFO, WARN, ERROR - import lang --import sha -+from hashlib import sha1 - import base64 - import os - import os.path -@@ -46,7 +46,7 @@ - class Avatar: - """ Represents an Avatar. Does not store the image in memory. """ - def __init__(self, imageData, avatarCache): -- self.__imageHash = sha.sha(imageData).hexdigest() -+ self.__imageHash = sha1(imageData).hexdigest() - self.__avatarCache = avatarCache - - def getImageHash(self): -diff -Naur pyicqt-0.8.1.5/src/contact.py p1//src/contact.py ---- pyicqt-0.8.1.5/src/contact.py 2010-06-07 12:16:43.000000000 +0200 -+++ p1//src/contact.py 2010-06-07 12:16:16.000000000 +0200 -@@ -8,7 +8,6 @@ - import config - from debug import LogEvent, INFO, WARN, ERROR - import lang --import sha - import legacy - import globals - import base64 -diff -Naur pyicqt-0.8.1.5/src/legacy/buddies.py p1//src/legacy/buddies.py ---- pyicqt-0.8.1.5/src/legacy/buddies.py 2009-08-24 14:37:59.000000000 +0200 -+++ p1//src/legacy/buddies.py 2010-06-07 12:07:37.000000000 +0200 -@@ -12,7 +12,7 @@ - import os.path - import binascii - import os.path --import md5 -+from hashlib import md5 - - X = os.path.sep - -@@ -188,7 +188,7 @@ - avatarData = avatar.AvatarCache().setAvatar(imgmanip.convertToPNG(iconData)) - c.updateAvatar(avatarData, push=True) - if not md5Hash: -- m = md5.new() -+ m = md5() - m.update(iconData) - md5Hash = m.digest() - if not numHash: -diff -Naur pyicqt-0.8.1.5/src/legacy/glue.py p1//src/legacy/glue.py ---- pyicqt-0.8.1.5/src/legacy/glue.py 2009-08-24 14:37:59.000000000 +0200 -+++ p1//src/legacy/glue.py 2010-06-07 12:07:37.000000000 +0200 -@@ -18,7 +18,7 @@ - import time - import binascii - import avatar --import md5 -+from hashlib import md5 - import random - - from twisted.python import log -@@ -398,7 +398,7 @@ - try: - self.myavatar = imgmanip.convertToJPG(imageData) - self.myavatarlen = len(self.myavatar) -- m=md5.new() -+ m=md5() - m.update(self.myavatar) - self.myavatarsum = m.digest() - self.myavatarstamp = time.time() -diff -Naur pyicqt-0.8.1.5/src/legacy/icqt.py p1//src/legacy/icqt.py ---- pyicqt-0.8.1.5/src/legacy/icqt.py 2009-08-24 14:37:59.000000000 +0200 -+++ p1//src/legacy/icqt.py 2010-06-07 12:07:37.000000000 +0200 -@@ -14,7 +14,6 @@ - import time - import datetime - import binascii --import md5 - import locale - import struct - -diff -Naur pyicqt-0.8.1.5/src/tlib/oscar.py p1//src/tlib/oscar.py ---- pyicqt-0.8.1.5/src/tlib/oscar.py 2009-08-24 14:37:59.000000000 +0200 -+++ p1//src/tlib/oscar.py 2010-06-07 12:07:37.000000000 +0200 -@@ -21,7 +21,7 @@ - from scheduler import Scheduler - - import struct --import md5 -+from hashlib import md5 - import string - import socket - import random -@@ -120,9 +120,9 @@ - return dict,data - - def encryptPasswordMD5(password,key): -- m=md5.new() -+ m=md5() - m.update(key) -- m.update(md5.new(password).digest()) -+ m.update(md5(password).digest()) - m.update("AOL Instant Messenger (SM)") - return m.digest() - -@@ -534,7 +534,7 @@ - self.iconSum = tlvs.get(0xd5,"") - - def updateIcon(self, iconData): -- m=md5.new() -+ m=md5() - m.update(iconData) - self.iconSum = m.digest() - log.msg("icon sum is %s" % binascii.hexlify(self.iconSum)) diff --git a/net-im/pyicq-t/files/pyicq-t.service b/net-im/pyicq-t/files/pyicq-t.service deleted file mode 100644 index 852ec13315af..000000000000 --- a/net-im/pyicq-t/files/pyicq-t.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=PyICQt is an ICQ transport for Jabber/XMPP - -[Service] -ExecStart=INSPATH/pyicq-t.py -c /etc/jabber/pyicq-t.xml -l /var/log/jabber/pyicq-t.log -User=jabber -Group=jabber - -[Install] -WantedBy=multi-user.target diff --git a/net-im/pyicq-t/metadata.xml b/net-im/pyicq-t/metadata.xml deleted file mode 100644 index 1e72bf501ea4..000000000000 --- a/net-im/pyicq-t/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - Python based jabber transport for ICQ - - Install dependencies needed for the web - interface - - - pyicqt - - diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild deleted file mode 100644 index 4fee72e75470..000000000000 --- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-single-r1 systemd - -MY_P="${P/pyicq-t/pyicqt}" - -DESCRIPTION="Python based jabber transport for ICQ" -HOMEPAGE="https://code.google.com/p/pyicqt/" -SRC_URI="https://pyicqt.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="webinterface" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS} - net-im/jabber-base" -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - dev-python/twisted[${PYTHON_MULTI_USEDEP}] - webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_MULTI_USEDEP}] ) - dev-python/pillow[${PYTHON_MULTI_USEDEP}] - ')" - -S="${WORKDIR}/${MY_P}" -PATCHES=( - "${FILESDIR}/${P}-python26-warnings.diff" - "${FILESDIR}/${P}-pillow-imaging.patch" -) - -src_install() { - python_moduleinto ${PN} - cp PyICQt.py ${PN}.py || die - python_domodule ${PN}.py data tools src - - insinto /etc/jabber - newins config_example.xml ${PN}.xml - fperms 600 /etc/jabber/${PN}.xml - fowners jabber:jabber /etc/jabber/${PN}.xml - chmod 755 "${D}$(python_get_sitedir)/${PN}/${PN}.py" || die - sed -i \ - -e "s:[^\<]*:/var/spool/jabber:" \ - -e "s:[^\<]*:/var/run/jabber/${PN}.pid:" \ - "${ED}/etc/jabber/${PN}.xml" || die - - newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN} - systemd_dounit "${FILESDIR}/${PN}.service" - sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" \ - "${ED}/etc/init.d/${PN}" "${D%/}/$(systemd_get_systemunitdir)/${PN}.service" || die - - python_fix_shebang "${D}$(python_get_sitedir)/${PN}" -} -- cgit v1.2.3