* [gentoo-commits] repo/gentoo:master commit in: net-im/pyaim-t/files/, net-im/pyaim-t/
@ 2018-01-07 14:23 Mikle Kolyada
0 siblings, 0 replies; only message in thread
From: Mikle Kolyada @ 2018-01-07 14:23 UTC (permalink / raw
To: gentoo-commits
commit: 7dbf45d0ac60ed868996a00ad6d2fc3d2f6c5b30
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 14:22:31 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 14:23:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dbf45d0
net-im/pyaim-t: remove last rited package
net-im/pyaim-t/Manifest | 1 -
net-im/pyaim-t/files/pyaim-t-0.8-initd-r1 | 23 ----
.../files/pyaim-t-0.8.0.1-pillow-imaging.patch | 36 -------
.../files/pyaim-t-0.8.0.1-python26-warnings.patch | 118 ---------------------
net-im/pyaim-t/metadata.xml | 14 ---
net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild | 58 ----------
6 files changed, 250 deletions(-)
diff --git a/net-im/pyaim-t/Manifest b/net-im/pyaim-t/Manifest
deleted file mode 100644
index 1c834fd3462..00000000000
--- a/net-im/pyaim-t/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyaim-t-0.8.0.1.tar.gz 143968 BLAKE2B c5693d0db48a1fff1031c1aef34bbee2c9822a1f5a239818dee4ff773443ac182d9bca5d7fbaa2f6439d2e9d54c8446d4fae9ad53bac2c027b282437507a81ab SHA512 70d92cb99f36452d95b32bda04ad5f4c74387ab4cc40ed3cd06da58285f4f4b5122aa470e34e4fb1dfedc13ef33feafb3ba6a7036caee9d95edb8969df730540
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1 b/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1
deleted file mode 100644
index d823e193c5a..00000000000
--- a/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
- use jabber-server
-}
-
-start() {
- ebegin "Starting AIM Jabber Transport"
- checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/
- start-stop-daemon --start --pidfile /var/run/jabber/pyaim-t.pid -u jabber -g jabber \
- --exec INSPATH/pyaim-t.py -- \
- -b -c /etc/jabber/pyaim-t.xml -l /var/log/jabber/pyaim-t.log
- eend $?
-}
-
-stop() {
- ebegin "Stopping AIM Jabber Transport"
- start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyaim-t.pid
- eend $?
-}
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch
deleted file mode 100644
index 13067925c18..00000000000
--- a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur pyaimt-0.8.0.1/src/contact.py pyaimt-0.8.0.1-1/src/contact.py
---- pyaimt-0.8.0.1/src/contact.py 2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-1/src/contact.py 2013-09-18 17:57:12.863780595 +0200
-@@ -13,7 +13,7 @@
- import globals
- import base64
- if not config.disableAvatars:
-- import Image
-+ import PIL.Image as Image
- import StringIO
-
-
-diff -Naur pyaimt-0.8.0.1/src/imgmanip.py pyaimt-0.8.0.1-1/src/imgmanip.py
---- pyaimt-0.8.0.1/src/imgmanip.py 2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-1/src/imgmanip.py 2013-09-18 17:57:12.863780595 +0200
-@@ -5,7 +5,7 @@
-
- if not config.disableAvatars:
- try:
-- import Image
-+ import PIL.Image as Image
- import StringIO
-
- def convertToPNG(imageData):
-diff -Naur pyaimt-0.8.0.1/tools/infodump.py pyaimt-0.8.0.1-1/tools/infodump.py
---- pyaimt-0.8.0.1/tools/infodump.py 2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-1/tools/infodump.py 2013-09-18 17:57:12.864780582 +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/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch
deleted file mode 100644
index a6fa52e757e..00000000000
--- a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Naur pyaimt-0.8.0.1/src/avatar.py pyaimt-0.8.0.1-py26//src/avatar.py
---- pyaimt-0.8.0.1/src/avatar.py 2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-py26//src/avatar.py 2011-08-24 20:30:06.146311346 +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 pyaimt-0.8.0.1/src/contact.py pyaimt-0.8.0.1-py26//src/contact.py
---- pyaimt-0.8.0.1/src/contact.py 2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-py26//src/contact.py 2011-08-24 20:30:06.146311346 +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 pyaimt-0.8.0.1/src/legacy/aimt.py pyaimt-0.8.0.1-py26//src/legacy/aimt.py
---- pyaimt-0.8.0.1/src/legacy/aimt.py 2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-py26//src/legacy/aimt.py 2011-08-24 20:32:28.187361518 +0200
-@@ -11,7 +11,6 @@
- import re
- import time
- import binascii
--import md5
- import imgmanip
-
-
-diff -Naur pyaimt-0.8.0.1/src/legacy/buddies.py pyaimt-0.8.0.1-py26//src/legacy/buddies.py
---- pyaimt-0.8.0.1/src/legacy/buddies.py 2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-py26//src/legacy/buddies.py 2011-08-24 20:30:06.147311326 +0200
-@@ -12,7 +12,7 @@
- import os.path
- import binascii
- import os.path
--import md5
-+from hashlib import md5
-
- X = os.path.sep
-
-@@ -138,7 +138,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 pyaimt-0.8.0.1/src/legacy/glue.py pyaimt-0.8.0.1-py26//src/legacy/glue.py
---- pyaimt-0.8.0.1/src/legacy/glue.py 2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-py26//src/legacy/glue.py 2011-08-24 20:31:20.066825898 +0200
-@@ -19,7 +19,7 @@
- import time
- import binascii
- import avatar
--import md5
-+from hashlib import md5
-
- # The name of the transport
- name = "AIM Transport"
-@@ -450,7 +450,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 pyaimt-0.8.0.1/src/tlib/oscar.py pyaimt-0.8.0.1-py26//src/tlib/oscar.py
---- pyaimt-0.8.0.1/src/tlib/oscar.py 2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-py26//src/tlib/oscar.py 2011-08-24 20:30:22.415200813 +0200
-@@ -20,7 +20,7 @@
- from scheduler import Scheduler
-
- import struct
--import md5
-+from hashlib import md5
- import string
- import socket
- import random
-@@ -106,9 +106,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/pyaim-t/metadata.xml b/net-im/pyaim-t/metadata.xml
deleted file mode 100644
index 756ad481ebe..00000000000
--- a/net-im/pyaim-t/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
- <longdescription>Python based jabber transport for AIM</longdescription>
- <use>
- <flag name="webinterface">Install dependencies needed for the web
- interface</flag>
- </use>
- <upstream>
- <remote-id type="google-code">pyaimt</remote-id>
- <remote-id type="launchpad">ubuntu</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild b/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
deleted file mode 100644
index fb672c1c678..00000000000
--- a/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-MY_PN="pyaimt"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python based jabber transport for AIM"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://debian/pool/main/p/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz -> ${P}.tar.gz
- https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN}_${PV}.orig.tar.gz -> ${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}
- dev-python/twisted-core[${PYTHON_USEDEP}]
- dev-python/twisted-words[${PYTHON_USEDEP}]
- dev-python/twisted-web[${PYTHON_USEDEP}]
- webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
- dev-python/pillow[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-python26-warnings.patch"
- epatch "${FILESDIR}/${P}-pillow-imaging.patch"
-}
-
-src_install() {
- python_moduleinto ${PN}
- cp PyAIMt.py ${PN}.py
- 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
- fperms 755 "$(python_get_sitedir)/${PN}/${PN}.py"
- sed -i \
- -e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
- -e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
- "${ED}/etc/jabber/${PN}.xml" || die
-
- newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN}
- sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" "${ED}/etc/init.d/${PN}" || die
- python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-01-07 14:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-07 14:23 [gentoo-commits] repo/gentoo:master commit in: net-im/pyaim-t/files/, net-im/pyaim-t/ Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox