1 |
commit: 1a4e5dbf5ea339164b251e7e0324bd1254814ff4 |
2 |
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 30 15:43:04 2016 +0000 |
4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 15:43:46 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a4e5dbf |
7 |
|
8 |
dev-python/apsw: revbump to vn. -3.9.2_p1-r1 |
9 |
|
10 |
revbump uses new SRC_URI fetching an adjusted tarball with a pre-built |
11 |
set of docs; add IUSE doc and doc install in the usual form |
12 |
Also bump to EAPI 6, patch submitted by E. Myers via the gentoo bug |
13 |
|
14 |
Gentoo bug: #573316 |
15 |
|
16 |
Package-Manager: portage-2.2.26 |
17 |
|
18 |
dev-python/apsw/Manifest | 2 +- |
19 |
...psw-3.9.2_p1.ebuild => apsw-3.9.2_p1-r1.ebuild} | 25 ++++++++++++---------- |
20 |
.../apsw/files/apsw-3.6.20.1-fix_tests.patch | 4 ++-- |
21 |
3 files changed, 17 insertions(+), 14 deletions(-) |
22 |
|
23 |
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest |
24 |
index 4adc939..7183715 100644 |
25 |
--- a/dev-python/apsw/Manifest |
26 |
+++ b/dev-python/apsw/Manifest |
27 |
@@ -1,4 +1,4 @@ |
28 |
DIST apsw-3.8.10.1_p1.tar.gz 307142 SHA256 af20221e1a65f593b47d83f1f8a136afc6d2199a22bc014251a44e31e7b0ca17 SHA512 1f997c6c88ca65995c8b5d894135d5900a4d2f56f877f74f0e99eab4ede0d06be5730ce282a5d99358318ca076eec75f2afe271574b6c02aaabf4bef181d0bda WHIRLPOOL 3e9b609a19ee39edda9af8140982c74d53d3e2b4c0bd05ea53974cb7a3c2f12f13ab4acf1d51ac5b50ee738f5380dc83b819e0ed11bf28107f903f0a52eb5949 |
29 |
DIST apsw-3.8.11.1_p1.tar.gz 307797 SHA256 f4dc653aca10dfae8578c8bf1125600f77d0d8dcc85b4185754388aa87ae0997 SHA512 4ca857d32f423475b17e81130d4919627d581b80dd6f3f120d95906ddad657d6f52eb69fb211612e15f5eaee0211c0ad992391c93068a463e72670d49f69c61e WHIRLPOOL 15a58a83e1e5f3ee4afc470a0d58e29f5ee5cf416897b1c83ad021fb9c47f0533a5e01417aa59fb74e7b33ad9e5f1a74b40c0cbffcee4cf01617006dbad3dc2a |
30 |
DIST apsw-3.8.7.1_p1.tar.gz 303446 SHA256 7aee29cc170332aa1a16fb80753152e809208bbc91823f64178e4afc32526fec SHA512 104aad3a8cec07647b71c77814cc069587daf84450b41f992d0b3c752c476105351b28912768a29f7952bfd75e9b2d3fcd8e6ae758b3bab8b986bf8e1300c256 WHIRLPOOL cc95728b07e384ee88002afce4b68abcfb259a62188cc77bad1154a83bf3e1979fec8761fe8a3c9e5ae35d5027cdf42c1b4a4b7749ad76d7935e032e253c8167 |
31 |
-DIST apsw-3.9.2_p1.tar.gz 308216 SHA256 6fae3f701f5cadca47195d814a02cec016f813f35d9d44d39596d293f5067577 SHA512 530940debc738e0902af266ccd14567c7ec6afe5866dcc2d66ace939cb681ea30da6b34e688ab986531266833e691a0233ad0c19bc4a105bb9e8c05f97adb537 WHIRLPOOL d44be5fa9245faea35c2f9fce894e62eac676957cdcce75673f3a671a01a3dd05c1bbfeca9b85f227419a1a46921324585675cbcc65cc83eb364520e5cf4a4b7 |
32 |
+DIST apsw-3.9.2_p1.zip 676275 SHA256 c1a9ff8b82658977eb0646b8400475a45342bd3fd197a51c48a8d78cc78b72d9 SHA512 dc85b4face24f03793ae8ca9744e55641230751fd888dedf423e2b33fc421c4cb13ce8105a2b7d801f504de4897f29de38c05da3f209204acf76172ace5605ad WHIRLPOOL a2328659f640cfaf4ab5975d54e94638495319767ae655a7011f95bc0062ec18e9a4b942b1e4d6d8c7d813cc848e986b5d56aa92db1dfac367769a8447506fb0 |
33 |
|
34 |
diff --git a/dev-python/apsw/apsw-3.9.2_p1.ebuild b/dev-python/apsw/apsw-3.9.2_p1-r1.ebuild |
35 |
similarity index 61% |
36 |
rename from dev-python/apsw/apsw-3.9.2_p1.ebuild |
37 |
rename to dev-python/apsw/apsw-3.9.2_p1-r1.ebuild |
38 |
index e556884..2fefe02 100644 |
39 |
--- a/dev-python/apsw/apsw-3.9.2_p1.ebuild |
40 |
+++ b/dev-python/apsw/apsw-3.9.2_p1-r1.ebuild |
41 |
@@ -1,42 +1,45 @@ |
42 |
-# Copyright 1999-2015 Gentoo Foundation |
43 |
+# Copyright 1999-2016 Gentoo Foundation |
44 |
# Distributed under the terms of the GNU General Public License v2 |
45 |
# $Id$ |
46 |
|
47 |
-EAPI=5 |
48 |
+EAPI=6 |
49 |
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) |
50 |
|
51 |
-inherit distutils-r1 |
52 |
+inherit distutils-r1 flag-o-matic |
53 |
|
54 |
MY_PV=${PV/_p/-r} |
55 |
MY_P=${PN}-${MY_PV} |
56 |
|
57 |
DESCRIPTION="APSW - Another Python SQLite Wrapper" |
58 |
HOMEPAGE="https://github.com/rogerbinns/apsw/" |
59 |
-SRC_URI="https://github.com/rogerbinns/apsw/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" |
60 |
+SRC_URI="https://github.com/rogerbinns/apsw/releases/download/${MY_PV}/${MY_P}.zip -> ${P}.zip" |
61 |
|
62 |
LICENSE="ZLIB" |
63 |
SLOT="0" |
64 |
KEYWORDS="~amd64 ~arm ~ppc64 ~x86" |
65 |
+IUSE="doc" |
66 |
|
67 |
RDEPEND=">=dev-db/sqlite-${PV%_p*}" |
68 |
-DEPEND="${RDEPEND}" |
69 |
+DEPEND="${RDEPEND} |
70 |
+ app-arch/unzip" |
71 |
|
72 |
S=${WORKDIR}/${MY_P} |
73 |
|
74 |
-PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch ) |
75 |
+PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" ) |
76 |
|
77 |
python_compile() { |
78 |
if ! python_is_python3; then |
79 |
- local CFLAGS="${CFLAGS} -fno-strict-aliasing" |
80 |
- export CFLAGS |
81 |
+ append-cflags -fno-strict-aliasing |
82 |
fi |
83 |
distutils-r1_python_compile --enable=load_extension |
84 |
} |
85 |
|
86 |
+python_install_all() { |
87 |
+ use doc && local HTML_DOCS=( doc/. ) |
88 |
+ distutils-r1_python_install_all |
89 |
+} |
90 |
+ |
91 |
python_test() { |
92 |
"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed" |
93 |
"${PYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}" |
94 |
} |
95 |
- |
96 |
-# Docs build is presently non-functional due to upstream issues |
97 |
-# See https://github.com/rogerbinns/apsw/issues/198 |
98 |
|
99 |
diff --git a/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch b/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch |
100 |
index 3bbce88..e252bf3 100644 |
101 |
--- a/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch |
102 |
+++ b/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch |
103 |
@@ -1,5 +1,5 @@ |
104 |
---- tests.py |
105 |
-+++ tests.py |
106 |
+--- a/tests.py |
107 |
++++ b/tests.py |
108 |
@@ -5480,7 +5480,7 @@ |
109 |
testnasty() |