Gentoo Archives: gentoo-commits

From: NP Hardass <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/acme-tiny/
Date: Tue, 27 Mar 2018 04:06:12
Message-Id: 1522123551.12481497f6548ed3d7c25baac894add49c47228a.np-hardass@gentoo
1 commit: 12481497f6548ed3d7c25baac894add49c47228a
2 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 20 15:45:19 2018 +0000
4 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 27 04:05:51 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12481497
7
8 app-crypt/acme-tiny: Bump to 4.0.3
9
10 --account-email flag changed to --contact, requires new syntax, so
11 make sure to update scripts accordingly
12
13 Package-Manager: Portage-2.3.24, Repoman-2.3.6
14
15 app-crypt/acme-tiny/Manifest | 1 +
16 ...cme-tiny-9999.ebuild => acme-tiny-4.0.3.ebuild} | 23 +++++++++++++---------
17 app-crypt/acme-tiny/acme-tiny-9999.ebuild | 23 +++++++++++++---------
18 3 files changed, 29 insertions(+), 18 deletions(-)
19
20 diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
21 index b176bea3185..3f8a4895242 100644
22 --- a/app-crypt/acme-tiny/Manifest
23 +++ b/app-crypt/acme-tiny/Manifest
24 @@ -1,2 +1,3 @@
25 DIST acme-tiny-0_p20170917.tar.gz 10516 BLAKE2B e9d4ae170579cd5379dbb4d900d051bc1789ac994eb491aafb9952cd004b3e3feed20ef505f88587035f3f16163e7965a1b3883caaaa8c2327fca6be0240a17f SHA512 0bfb0d064f21f9d89e3c5863f33c7326c02948a42e2c8dc11c7b5baaf5e0dfcaeba0ad461b2ad12e292cc14f64b44f331f11b56dda6592a4663baf0714048700
26 DIST acme-tiny-4.0.0.tar.gz 11934 BLAKE2B 2303fcd4e14d75cb7b36426f9ffe7e5f989d886be16b322aea2f8b40937e8c1a850704869570911ff7365a9545f5e41006f4e655ba207db9a7105ec3d59c8c32 SHA512 45f3469fbfa8b57c5755595823a6d08fd977c29d948b618ab6bd9c4feba4910bdcc1540757ba78bcdcd7e01c6f7451f4e8aec951a0ae118ab6597a1714f30691
27 +DIST acme-tiny-4.0.3.tar.gz 12662 BLAKE2B 6a17d0597731a5c8c1b260fa47396cb5bf8a223f44c8e498532b6e90a2ded35c5fcae058a8682e59ab060c1eeb27e09c8db8588e1d72cfd75b65f867d3e94f9a SHA512 bd37d4f878f2851c8e88acb78699b855cfd306928e2d70ef1d35dc9883d44dae3c7622e2114b1d5c4e0c5865b61ad3958a776467ab45eaedb0cf612530ca5dc7
28
29 diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
30 similarity index 66%
31 copy from app-crypt/acme-tiny/acme-tiny-9999.ebuild
32 copy to app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
33 index c36ebd5cd3c..b9815c34809 100644
34 --- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
35 +++ b/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
36 @@ -4,7 +4,7 @@
37 EAPI=6
38
39 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
40 -inherit distutils-r1
41 +inherit distutils-r1 eapi7-ver
42
43 if [[ ${PV} == 9999 ]]; then
44 inherit git-r3
45 @@ -20,8 +20,7 @@ HOMEPAGE="https://github.com/diafygi/acme-tiny"
46
47 LICENSE="MIT"
48 SLOT="0"
49 -
50 -IUSE="minimal"
51 +IUSE=""
52
53 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
54 RDEPEND="dev-libs/openssl:0"
55 @@ -33,11 +32,17 @@ pkg_setup() {
56 }
57
58 src_prepare() {
59 - if ! use minimal; then
60 - local PATCHES=(
61 - "${FILESDIR}/${PN}-PR87-readmefix.patch"
62 - "${FILESDIR}/${PN}-4.0.0-PR101-contactinfo.patch"
63 - )
64 - fi
65 + sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
66 +
67 distutils-r1_src_prepare
68 }
69 +
70 +pkg_postinst() {
71 + for v in ${REPLACING_VERSIONS}; do
72 + if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
73 + einfo "The --account-email flag has been changed to --contact and"
74 + einfo "has different syntax."
75 + einfo "Please update your scripts accordingly"
76 + fi
77 + done
78 +}
79
80 diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
81 index c36ebd5cd3c..b9815c34809 100644
82 --- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
83 +++ b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
84 @@ -4,7 +4,7 @@
85 EAPI=6
86
87 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
88 -inherit distutils-r1
89 +inherit distutils-r1 eapi7-ver
90
91 if [[ ${PV} == 9999 ]]; then
92 inherit git-r3
93 @@ -20,8 +20,7 @@ HOMEPAGE="https://github.com/diafygi/acme-tiny"
94
95 LICENSE="MIT"
96 SLOT="0"
97 -
98 -IUSE="minimal"
99 +IUSE=""
100
101 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
102 RDEPEND="dev-libs/openssl:0"
103 @@ -33,11 +32,17 @@ pkg_setup() {
104 }
105
106 src_prepare() {
107 - if ! use minimal; then
108 - local PATCHES=(
109 - "${FILESDIR}/${PN}-PR87-readmefix.patch"
110 - "${FILESDIR}/${PN}-4.0.0-PR101-contactinfo.patch"
111 - )
112 - fi
113 + sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
114 +
115 distutils-r1_src_prepare
116 }
117 +
118 +pkg_postinst() {
119 + for v in ${REPLACING_VERSIONS}; do
120 + if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
121 + einfo "The --account-email flag has been changed to --contact and"
122 + einfo "has different syntax."
123 + einfo "Please update your scripts accordingly"
124 + fi
125 + done
126 +}