Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-misc/urlwatch/files/, www-misc/urlwatch/
Date: Sat, 03 Sep 2016 22:00:40
Message-Id: 1472940024.d647d8a196e878cac8b409c9b95d659abee344f2.monsieurp@gentoo
1 commit: d647d8a196e878cac8b409c9b95d659abee344f2
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 3 22:00:03 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 3 22:00:24 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d647d8a1
7
8 www-misc/urlwatch: Clean up old.
9
10 Package-Manager: portage-2.2.28
11
12 www-misc/urlwatch/Manifest | 2 -
13 .../urlwatch/files/urlwatch-2.2-fix-install.patch | 42 --------------------
14 www-misc/urlwatch/urlwatch-1.18.ebuild | 28 -------------
15 www-misc/urlwatch/urlwatch-2.2.ebuild | 46 ----------------------
16 4 files changed, 118 deletions(-)
17
18 diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
19 index f82a79b..4b2b452 100644
20 --- a/www-misc/urlwatch/Manifest
21 +++ b/www-misc/urlwatch/Manifest
22 @@ -1,3 +1 @@
23 -DIST urlwatch-1.18.tar.gz 14987 SHA256 6b17411b6658f3aeb5839d1b32458f020ce40ee1e62a3d40387a2622fa731824 SHA512 ffbfb41e5b6ca71abf19132424dc1bfb3d0cfc30a644615c34539bb5b00acea5803d4c30637c58e9682820c5411227f7c579344c1e212f575431a1c650a7e520 WHIRLPOOL 49915ef83cc835b8ac67216eaeb61391195f28fa28b5716c7e1cc8c8dac465d9f3670beb408c80dc3fa5315683467524b02b1663fb671f26338059acfa247b23
24 -DIST urlwatch-2.2.tar.gz 24435 SHA256 a3257ab795adb91514c7163610c7a916ccce9df9ab2cfdef2b72c250ab292069 SHA512 680547d01da6830059048247be4467c68ce9977786f3ba1ec0ad470eb77608b6938c244ed9341ddfd382d65cae167338c685bff2eac91a5f15e881c2aca7bb9b WHIRLPOOL 46d0dce6dc904e15561986e724882592a174c0c2480daf4eac81a4616b7b73d32033b06e70fafad3b399e557365b084e6f7518fa070420ecd22e4340b7b45f96
25 DIST urlwatch-2.5.tar.gz 25322 SHA256 6010a45dbc20d5449f214655c94977a65e1e2b8ba32f58e9045ddfdaaabf3962 SHA512 993d2596288d014a3b84ae22c29ce89282c4320dd95b339c9892db07997059fc80a96198cb89ba04d935f68d2d051da96dc981f8e8b3657492443b060d2126a1 WHIRLPOOL d8be345d19027e475825d708f9ce2c55fe4abb23e903d629aec872104a0e890f225dfe3f1c8de87541e9cbed7c62592d362e464f3014f0a7ce27000fd9a5f880
26
27 diff --git a/www-misc/urlwatch/files/urlwatch-2.2-fix-install.patch b/www-misc/urlwatch/files/urlwatch-2.2-fix-install.patch
28 deleted file mode 100644
29 index 66626db..00000000
30 --- a/www-misc/urlwatch/files/urlwatch-2.2-fix-install.patch
31 +++ /dev/null
32 @@ -1,42 +0,0 @@
33 -From ebe7b90100a3d960f53fdc9409d2d89eaa61bf11 Mon Sep 17 00:00:00 2001
34 -From: Thomas Perl <m@×××.io>
35 -Date: Tue, 28 Jun 2016 18:15:51 +0200
36 -Subject: [PATCH] Check current directory and use os.path.relpath (Fixes #73)
37 -
38 ----
39 - setup.py | 11 ++++++++---
40 - 1 file changed, 8 insertions(+), 3 deletions(-)
41 -
42 -diff --git a/setup.py b/setup.py
43 -index 947a7c8..45405cd 100644
44 ---- a/setup.py
45 -+++ b/setup.py
46 -@@ -7,10 +7,15 @@
47 -
48 - import os
49 - import re
50 -+import sys
51 -
52 - PACKAGE_NAME = 'urlwatch'
53 - DEPENDENCIES = ['minidb', 'PyYAML', 'requests']
54 --HERE = os.path.dirname(__file__)
55 -+HERE = os.path.abspath(os.path.dirname(__file__))
56 -+
57 -+if os.path.normpath(os.getcwd()) != os.path.normpath(HERE):
58 -+ print('You must run {} inside {} (cwd={})'.format(os.path.basename(__file__), HERE, os.getcwd()))
59 -+ sys.exit(1)
60 -
61 - # Assumptions:
62 - # 1. Package name equals main script file name (and only one script)
63 -@@ -29,9 +34,9 @@
64 -
65 - m['scripts'] = [os.path.join(HERE, PACKAGE_NAME)]
66 - m['package_dir'] = {'': os.path.join(HERE, 'lib')}
67 --m['packages'] = ['.'.join(dirname[len(HERE)+1:].split(os.sep)[1:])
68 -+m['packages'] = ['.'.join(os.path.relpath(dirname, HERE).split(os.sep)[1:])
69 - for dirname, _, files in os.walk(os.path.join(HERE, 'lib')) if '__init__.py' in files]
70 --m['data_files'] = [(dirname[len(HERE)+1:], [os.path.join(dirname[len(HERE)+1:], fn) for fn in files])
71 -+m['data_files'] = [(os.path.relpath(dirname, HERE), [os.path.join(os.path.relpath(dirname, HERE), fn) for fn in files])
72 - for dirname, _, files in os.walk(os.path.join(HERE, 'share')) if files]
73 - m['install_requires'] = DEPENDENCIES
74 -
75
76 diff --git a/www-misc/urlwatch/urlwatch-1.18.ebuild b/www-misc/urlwatch/urlwatch-1.18.ebuild
77 deleted file mode 100644
78 index 938f929..00000000
79 --- a/www-misc/urlwatch/urlwatch-1.18.ebuild
80 +++ /dev/null
81 @@ -1,28 +0,0 @@
82 -# Copyright 1999-2016 Gentoo Foundation
83 -# Distributed under the terms of the GNU General Public License v2
84 -# $Id$
85 -
86 -EAPI="5"
87 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
88 -
89 -inherit distutils-r1
90 -
91 -DESCRIPTION="A tool for monitoring webpages for updates"
92 -HOMEPAGE="http://thp.io/2008/urlwatch/ https://pypi.python.org/pypi/urlwatch"
93 -SRC_URI="http://thp.io/2008/${PN}/${P}.tar.gz"
94 -
95 -LICENSE="BSD"
96 -SLOT="0"
97 -KEYWORDS="amd64 x86"
98 -IUSE=""
99 -
100 -DEPEND="virtual/python-futures[${PYTHON_USEDEP}]"
101 -RDEPEND="${DEPEND}
102 - || ( www-client/lynx app-text/html2text )"
103 -
104 -python_prepare() {
105 - if [[ ${EPYTHON} == python3.* ]]; then
106 - 2to3 -nw --no-diffs urlwatch lib/urlwatch/*.py \
107 - share/urlwatch/examples/hooks.py.example setup.py || die
108 - fi
109 -}
110
111 diff --git a/www-misc/urlwatch/urlwatch-2.2.ebuild b/www-misc/urlwatch/urlwatch-2.2.ebuild
112 deleted file mode 100644
113 index a9d7a73..00000000
114 --- a/www-misc/urlwatch/urlwatch-2.2.ebuild
115 +++ /dev/null
116 @@ -1,46 +0,0 @@
117 -# Copyright 1999-2016 Gentoo Foundation
118 -# Distributed under the terms of the GNU General Public License v2
119 -# $Id$
120 -
121 -EAPI="6"
122 -PYTHON_COMPAT=( python{3_4,3_5} )
123 -
124 -inherit distutils-r1
125 -
126 -DESCRIPTION="A tool for monitoring webpages for updates"
127 -HOMEPAGE="https://thp.io/2008/urlwatch/ https://pypi.python.org/pypi/urlwatch"
128 -SRC_URI="https://thp.io/2008/${PN}/${P}.tar.gz"
129 -
130 -LICENSE="BSD"
131 -SLOT="0"
132 -KEYWORDS="~amd64 ~x86"
133 -IUSE="test"
134 -
135 -RDEPEND="
136 - dev-python/keyring[${PYTHON_USEDEP}]
137 - dev-python/pyyaml[${PYTHON_USEDEP}]
138 - dev-python/minidb[${PYTHON_USEDEP}]
139 - dev-python/requests[${PYTHON_USEDEP}]
140 - || ( www-client/lynx app-text/html2text )
141 -"
142 -DEPEND="
143 - dev-python/setuptools[${PYTHON_USEDEP}]
144 - test? (
145 - ${RDEPEND}
146 - dev-python/nose[${PYTHON_USEDEP}]
147 - )
148 -"
149 -
150 -PATCHES=( "${FILESDIR}/${P}-fix-install.patch" )
151 -
152 -python_test() {
153 - nosetests test || die "tests failed with ${EPYTHON}"
154 -}
155 -
156 -pkg_postinst() {
157 - if [[ -z "${REPLACING_VERSIONS}" ]] && \
158 - ! has_version dev-python/chump; then
159 - elog "Install 'dev-python/chump' to enable Pushover" \
160 - "notifications support"
161 - fi
162 -}