| 1 |
commit: 123ef41078b189fd97322e1238ed9bab60a6f653 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 29 23:43:37 2022 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 29 23:44:00 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123ef410 |
| 7 |
|
| 8 |
sys-apps/less: bump beta & add live ebuild |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-apps/less/Manifest | 2 +- |
| 13 |
sys-apps/less/{less-617.ebuild => less-618_beta.ebuild} | 12 +++++++++++- |
| 14 |
sys-apps/less/{less-617.ebuild => less-9999.ebuild} | 12 +++++++++++- |
| 15 |
3 files changed, 23 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest |
| 18 |
index 0c602fcbaf77..8b826e5261fa 100644 |
| 19 |
--- a/sys-apps/less/Manifest |
| 20 |
+++ b/sys-apps/less/Manifest |
| 21 |
@@ -1,2 +1,2 @@ |
| 22 |
DIST less-608.tar.gz 362346 BLAKE2B 988940745fef1222c43b0bf4edec7cc7206ded0ac5d89d3faf4dab706a249913581c2fe7aa6063cf3d717176ed07b69299d3e791ba8a60358483fe9d1bf7f7c6 SHA512 7945b7f88921832ebb1b45fba8cbb449ee0133342796b654a52c146dfff3d84db18724ee84e53349eeea6017a0ebe2d8eb5366210275981dde7bb7190118fa66 |
| 23 |
-DIST less-617-beta.tar.gz 366906 BLAKE2B ccadbdefc33b2df416058cb065afc5e4f8278d49615bf1b25c47180539d080f29f574c4871d0424cc6413b70e7fab99799d4a2661ab8bbc1894526603b94dbff SHA512 16365e79d0fa1e5c70a182e209a1ecc8c33242dcc973680f036ed09054dfd6910d63d79cb080cb1b2cffc5b7d8850666116ad7ee6de1db6140f2fd58ad00ad19 |
| 24 |
+DIST less-618-beta.tar.gz 365786 BLAKE2B b1957ab49059a2df14d8ba5daf1d8543adc4546c44b537d86959e2e1fe2df93f99ceb8ef47097b6f84f75f7740e161269b4e1d5dd263b8171212c87e650a02fe SHA512 6197aa20c77a846e53b376aa63c2863242c40663e72213f66c3597bd8c38a9458163d0c9ba0ca7690574c07348bb7d3e108c3b50dbbedbc9e5707a14d946b280 |
| 25 |
|
| 26 |
diff --git a/sys-apps/less/less-617.ebuild b/sys-apps/less/less-618_beta.ebuild |
| 27 |
similarity index 83% |
| 28 |
copy from sys-apps/less/less-617.ebuild |
| 29 |
copy to sys-apps/less/less-618_beta.ebuild |
| 30 |
index cb210766d048..9add6f6c1d52 100644 |
| 31 |
--- a/sys-apps/less/less-617.ebuild |
| 32 |
+++ b/sys-apps/less/less-618_beta.ebuild |
| 33 |
@@ -5,6 +5,11 @@ EAPI=8 |
| 34 |
WANT_AUTOMAKE=none |
| 35 |
WANT_LIBTOOL=none |
| 36 |
|
| 37 |
+if [[ $PV == 9999 ]]; then |
| 38 |
+ EGIT_REPO_URI="https://github.com/gwsw/less" |
| 39 |
+ inherit git-r3 |
| 40 |
+fi |
| 41 |
+ |
| 42 |
inherit autotools |
| 43 |
|
| 44 |
# Releases are usually first a beta then promoted to stable if no |
| 45 |
@@ -12,9 +17,12 @@ inherit autotools |
| 46 |
# the beta versions. It's okay to keyword beta versions if they fix |
| 47 |
# a serious bug, but otherwise try to avoid it. |
| 48 |
|
| 49 |
+MY_PV=${PV/_beta/-beta} |
| 50 |
+MY_P=${PN}-${MY_PV} |
| 51 |
DESCRIPTION="Excellent text file viewer" |
| 52 |
HOMEPAGE="http://www.greenwoodsoftware.com/less/" |
| 53 |
-SRC_URI="http://www.greenwoodsoftware.com/less/${P}-beta.tar.gz" |
| 54 |
+[ $PV != 9999 ] && SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz" |
| 55 |
+S=${WORKDIR}/${MY_P/?beta} |
| 56 |
|
| 57 |
LICENSE="|| ( GPL-3 BSD-2 )" |
| 58 |
SLOT="0" |
| 59 |
@@ -28,6 +36,8 @@ RDEPEND="${DEPEND}" |
| 60 |
|
| 61 |
src_prepare() { |
| 62 |
default |
| 63 |
+ # Per upstream README to prepare live build |
| 64 |
+ [ $PV == 9999 ] && emake -f Makefile.aut distfiles |
| 65 |
# Upstream uses unpatched autoconf-2.69, which breaks with clang-16. |
| 66 |
# https://bugs.gentoo.org/870412 |
| 67 |
eautoreconf |
| 68 |
|
| 69 |
diff --git a/sys-apps/less/less-617.ebuild b/sys-apps/less/less-9999.ebuild |
| 70 |
similarity index 83% |
| 71 |
rename from sys-apps/less/less-617.ebuild |
| 72 |
rename to sys-apps/less/less-9999.ebuild |
| 73 |
index cb210766d048..9add6f6c1d52 100644 |
| 74 |
--- a/sys-apps/less/less-617.ebuild |
| 75 |
+++ b/sys-apps/less/less-9999.ebuild |
| 76 |
@@ -5,6 +5,11 @@ EAPI=8 |
| 77 |
WANT_AUTOMAKE=none |
| 78 |
WANT_LIBTOOL=none |
| 79 |
|
| 80 |
+if [[ $PV == 9999 ]]; then |
| 81 |
+ EGIT_REPO_URI="https://github.com/gwsw/less" |
| 82 |
+ inherit git-r3 |
| 83 |
+fi |
| 84 |
+ |
| 85 |
inherit autotools |
| 86 |
|
| 87 |
# Releases are usually first a beta then promoted to stable if no |
| 88 |
@@ -12,9 +17,12 @@ inherit autotools |
| 89 |
# the beta versions. It's okay to keyword beta versions if they fix |
| 90 |
# a serious bug, but otherwise try to avoid it. |
| 91 |
|
| 92 |
+MY_PV=${PV/_beta/-beta} |
| 93 |
+MY_P=${PN}-${MY_PV} |
| 94 |
DESCRIPTION="Excellent text file viewer" |
| 95 |
HOMEPAGE="http://www.greenwoodsoftware.com/less/" |
| 96 |
-SRC_URI="http://www.greenwoodsoftware.com/less/${P}-beta.tar.gz" |
| 97 |
+[ $PV != 9999 ] && SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz" |
| 98 |
+S=${WORKDIR}/${MY_P/?beta} |
| 99 |
|
| 100 |
LICENSE="|| ( GPL-3 BSD-2 )" |
| 101 |
SLOT="0" |
| 102 |
@@ -28,6 +36,8 @@ RDEPEND="${DEPEND}" |
| 103 |
|
| 104 |
src_prepare() { |
| 105 |
default |
| 106 |
+ # Per upstream README to prepare live build |
| 107 |
+ [ $PV == 9999 ] && emake -f Makefile.aut distfiles |
| 108 |
# Upstream uses unpatched autoconf-2.69, which breaks with clang-16. |
| 109 |
# https://bugs.gentoo.org/870412 |
| 110 |
eautoreconf |
Archives