1 |
commit: 6329f9f3f20d3a8178404b7bf05397d34036ab30 |
2 |
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jul 5 18:24:00 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 7 07:19:22 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6329f9f3 |
7 |
|
8 |
www-misc/urlwatch: bump to 2.2, use HTTPS URLs |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/1830 |
12 |
|
13 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
14 |
|
15 |
www-misc/urlwatch/Manifest | 1 + |
16 |
.../urlwatch/files/urlwatch-2.2-fix-install.patch | 42 ++++++++++++++++++++ |
17 |
www-misc/urlwatch/metadata.xml | 2 + |
18 |
www-misc/urlwatch/urlwatch-2.2.ebuild | 46 ++++++++++++++++++++++ |
19 |
4 files changed, 91 insertions(+) |
20 |
|
21 |
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest |
22 |
index 332f126..19afc97 100644 |
23 |
--- a/www-misc/urlwatch/Manifest |
24 |
+++ b/www-misc/urlwatch/Manifest |
25 |
@@ -1,3 +1,4 @@ |
26 |
DIST urlwatch-1.18.tar.gz 14987 SHA256 6b17411b6658f3aeb5839d1b32458f020ce40ee1e62a3d40387a2622fa731824 SHA512 ffbfb41e5b6ca71abf19132424dc1bfb3d0cfc30a644615c34539bb5b00acea5803d4c30637c58e9682820c5411227f7c579344c1e212f575431a1c650a7e520 WHIRLPOOL 49915ef83cc835b8ac67216eaeb61391195f28fa28b5716c7e1cc8c8dac465d9f3670beb408c80dc3fa5315683467524b02b1663fb671f26338059acfa247b23 |
27 |
DIST urlwatch-2.0.tar.gz 22988 SHA256 6be8034671788b8c3633d12e16ae69685f0c4341d2c46bed0e847749f8c76848 SHA512 00855557daccf2c418382082392173f03d694be0b6e643ad06fb2a6e0329d17fac37232867686d8e0a6cb79f037e4127a5ea78739bfcd8acfd1cffccf2d78b75 WHIRLPOOL e0f7fce989391aad6f85dc075e91987bfa1e7fcff06d252625716b692a5052f0dac31553e1676522ef7c0df1488f3059c31ba47922a6cf755d47518fe5e90179 |
28 |
DIST urlwatch-2.1.tar.gz 25134 SHA256 6627b753f9c7a908863899b1b4eb9283ef8a630bf78490c6e492275a5919c476 SHA512 60960b41b592d45a29f967d212580b2687afc5d5053adef7c796044e404a4a1e120ea66d8cd0cbf869cccead76373db0d0ab6d6541a77cc4f8885c02b098f6d2 WHIRLPOOL 6a9344d9cbfd0afdc79c0d9af364fba493a9c65f6f4fdf322baf3e5a635e231986789d11428e15c40d89030ff587fc9f9f90833f65109af59bd81cc0f70be193 |
29 |
+DIST urlwatch-2.2.tar.gz 24435 SHA256 a3257ab795adb91514c7163610c7a916ccce9df9ab2cfdef2b72c250ab292069 SHA512 680547d01da6830059048247be4467c68ce9977786f3ba1ec0ad470eb77608b6938c244ed9341ddfd382d65cae167338c685bff2eac91a5f15e881c2aca7bb9b WHIRLPOOL 46d0dce6dc904e15561986e724882592a174c0c2480daf4eac81a4616b7b73d32033b06e70fafad3b399e557365b084e6f7518fa070420ecd22e4340b7b45f96 |
30 |
|
31 |
diff --git a/www-misc/urlwatch/files/urlwatch-2.2-fix-install.patch b/www-misc/urlwatch/files/urlwatch-2.2-fix-install.patch |
32 |
new file mode 100644 |
33 |
index 0000000..66626db |
34 |
--- /dev/null |
35 |
+++ b/www-misc/urlwatch/files/urlwatch-2.2-fix-install.patch |
36 |
@@ -0,0 +1,42 @@ |
37 |
+From ebe7b90100a3d960f53fdc9409d2d89eaa61bf11 Mon Sep 17 00:00:00 2001 |
38 |
+From: Thomas Perl <m@×××.io> |
39 |
+Date: Tue, 28 Jun 2016 18:15:51 +0200 |
40 |
+Subject: [PATCH] Check current directory and use os.path.relpath (Fixes #73) |
41 |
+ |
42 |
+--- |
43 |
+ setup.py | 11 ++++++++--- |
44 |
+ 1 file changed, 8 insertions(+), 3 deletions(-) |
45 |
+ |
46 |
+diff --git a/setup.py b/setup.py |
47 |
+index 947a7c8..45405cd 100644 |
48 |
+--- a/setup.py |
49 |
++++ b/setup.py |
50 |
+@@ -7,10 +7,15 @@ |
51 |
+ |
52 |
+ import os |
53 |
+ import re |
54 |
++import sys |
55 |
+ |
56 |
+ PACKAGE_NAME = 'urlwatch' |
57 |
+ DEPENDENCIES = ['minidb', 'PyYAML', 'requests'] |
58 |
+-HERE = os.path.dirname(__file__) |
59 |
++HERE = os.path.abspath(os.path.dirname(__file__)) |
60 |
++ |
61 |
++if os.path.normpath(os.getcwd()) != os.path.normpath(HERE): |
62 |
++ print('You must run {} inside {} (cwd={})'.format(os.path.basename(__file__), HERE, os.getcwd())) |
63 |
++ sys.exit(1) |
64 |
+ |
65 |
+ # Assumptions: |
66 |
+ # 1. Package name equals main script file name (and only one script) |
67 |
+@@ -29,9 +34,9 @@ |
68 |
+ |
69 |
+ m['scripts'] = [os.path.join(HERE, PACKAGE_NAME)] |
70 |
+ m['package_dir'] = {'': os.path.join(HERE, 'lib')} |
71 |
+-m['packages'] = ['.'.join(dirname[len(HERE)+1:].split(os.sep)[1:]) |
72 |
++m['packages'] = ['.'.join(os.path.relpath(dirname, HERE).split(os.sep)[1:]) |
73 |
+ for dirname, _, files in os.walk(os.path.join(HERE, 'lib')) if '__init__.py' in files] |
74 |
+-m['data_files'] = [(dirname[len(HERE)+1:], [os.path.join(dirname[len(HERE)+1:], fn) for fn in files]) |
75 |
++m['data_files'] = [(os.path.relpath(dirname, HERE), [os.path.join(os.path.relpath(dirname, HERE), fn) for fn in files]) |
76 |
+ for dirname, _, files in os.walk(os.path.join(HERE, 'share')) if files] |
77 |
+ m['install_requires'] = DEPENDENCIES |
78 |
+ |
79 |
|
80 |
diff --git a/www-misc/urlwatch/metadata.xml b/www-misc/urlwatch/metadata.xml |
81 |
index 7be7880..66d7093 100644 |
82 |
--- a/www-misc/urlwatch/metadata.xml |
83 |
+++ b/www-misc/urlwatch/metadata.xml |
84 |
@@ -7,5 +7,7 @@ |
85 |
</maintainer> |
86 |
<upstream> |
87 |
<remote-id type="pypi">urlwatch</remote-id> |
88 |
+ <remote-id type="github">thp/urlwatch</remote-id> |
89 |
+ <bugs-to>https://github.com/thp/urlwatch/issues</bugs-to> |
90 |
</upstream> |
91 |
</pkgmetadata> |
92 |
|
93 |
diff --git a/www-misc/urlwatch/urlwatch-2.2.ebuild b/www-misc/urlwatch/urlwatch-2.2.ebuild |
94 |
new file mode 100644 |
95 |
index 0000000..a9d7a73 |
96 |
--- /dev/null |
97 |
+++ b/www-misc/urlwatch/urlwatch-2.2.ebuild |
98 |
@@ -0,0 +1,46 @@ |
99 |
+# Copyright 1999-2016 Gentoo Foundation |
100 |
+# Distributed under the terms of the GNU General Public License v2 |
101 |
+# $Id$ |
102 |
+ |
103 |
+EAPI="6" |
104 |
+PYTHON_COMPAT=( python{3_4,3_5} ) |
105 |
+ |
106 |
+inherit distutils-r1 |
107 |
+ |
108 |
+DESCRIPTION="A tool for monitoring webpages for updates" |
109 |
+HOMEPAGE="https://thp.io/2008/urlwatch/ https://pypi.python.org/pypi/urlwatch" |
110 |
+SRC_URI="https://thp.io/2008/${PN}/${P}.tar.gz" |
111 |
+ |
112 |
+LICENSE="BSD" |
113 |
+SLOT="0" |
114 |
+KEYWORDS="~amd64 ~x86" |
115 |
+IUSE="test" |
116 |
+ |
117 |
+RDEPEND=" |
118 |
+ dev-python/keyring[${PYTHON_USEDEP}] |
119 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
120 |
+ dev-python/minidb[${PYTHON_USEDEP}] |
121 |
+ dev-python/requests[${PYTHON_USEDEP}] |
122 |
+ || ( www-client/lynx app-text/html2text ) |
123 |
+" |
124 |
+DEPEND=" |
125 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
126 |
+ test? ( |
127 |
+ ${RDEPEND} |
128 |
+ dev-python/nose[${PYTHON_USEDEP}] |
129 |
+ ) |
130 |
+" |
131 |
+ |
132 |
+PATCHES=( "${FILESDIR}/${P}-fix-install.patch" ) |
133 |
+ |
134 |
+python_test() { |
135 |
+ nosetests test || die "tests failed with ${EPYTHON}" |
136 |
+} |
137 |
+ |
138 |
+pkg_postinst() { |
139 |
+ if [[ -z "${REPLACING_VERSIONS}" ]] && \ |
140 |
+ ! has_version dev-python/chump; then |
141 |
+ elog "Install 'dev-python/chump' to enable Pushover" \ |
142 |
+ "notifications support" |
143 |
+ fi |
144 |
+} |