Compare commits

..

2 Commits

Author SHA1 Message Date
Maciej Barć
e6f7c7dc2c Merge branch 'pandoc-fix' into 'master'
app-text/pandoc-bin: Deleted old version and fix issue with ${S}, manifests

See merge request src_prepare/src_prepare-overlay!172
2021-05-11 22:43:44 +00:00
3fa59f13ab
app-text/pandoc-bin: Deleted old version and fix issue with ${S}, manifests
Signed-off-by: Marcin Woźniak <y0rune@aol.com>

Hi!
I tried to update the pandoc but I had the problem:

```bash
[ 23:24:38 ] PREPARE for version 2.13 of pandoc-bin from app-text
 * ERROR: app-text/pandoc-bin-2.13::src_prepare-overlay failed (prepare phase):
 *   The source directory '/var/tmp/portage/app-text/pandoc-bin-2.13/work/pandoc-2.13' doesn't exist
 *
 * Call stack:
 *            ebuild.sh, line  762:  Called __ebuild_main 'prepare'
 *   phase-functions.sh, line 1050:  Called __dyn_prepare
 *   phase-functions.sh, line  384:  Called die
 * The specific snippet of code:
 *              die "The source directory '${S}' doesn't exist"
```

So I fix the issue. I tested it in the separated Gentoo.
2021-05-12 00:17:02 +02:00
4 changed files with 6 additions and 53 deletions

View File

@ -1,2 +1,3 @@
DIST pandoc-2.10.1-linux-amd64.tar.gz 24738243 BLAKE2B b139274bbce6c8ee57ab9a29d6bd1bab23b543a8e93841dfa2f5640b944a5e927360517d9e9f840c73a6ca1455d678ef780577279f9cea34ea985ba2298de2c9 SHA512 5de8bcdf4c008e4521432cd4af86e7b8f6e309b8373a43b8d51b91825a1cc7e05fd59c24ef606b5ea92403383c9c5cb565f3c5f4335148b30cd4bc92211a7b83
DIST pandoc-2.11.0.2-linux-amd64.tar.gz 16461694 BLAKE2B 28c318d4afdc3e320772c5b7048868b4d94fae40d9237e030eeefc104344f9669796c1828a9e3bffe311708235b0d637886606a56cde9480f2dc60c3647d0148 SHA512 fa3ffaba6e1686840d91e0b6c37d34734d4b11664cd0a898d1338f2379f0fa09b02989432b3bdaa9df08ea4baee092b1ec6b98ecb48f8680f0a2f4ebba104a11 DIST pandoc-2.11.0.2-linux-amd64.tar.gz 16461694 BLAKE2B 28c318d4afdc3e320772c5b7048868b4d94fae40d9237e030eeefc104344f9669796c1828a9e3bffe311708235b0d637886606a56cde9480f2dc60c3647d0148 SHA512 fa3ffaba6e1686840d91e0b6c37d34734d4b11664cd0a898d1338f2379f0fa09b02989432b3bdaa9df08ea4baee092b1ec6b98ecb48f8680f0a2f4ebba104a11
DIST pandoc-2.13-linux-amd64.tar.gz 15019808 BLAKE2B 93ae77777f70be0b79544ecb8fc5df3687465bd399b5a6532fae5a115d7235934bd39989aeb014025c0cd285542cc59410eb6575cd495a0302e358f13e81a2f3 SHA512 0b20327ac530cbcd00d27b84e8c2bce98977e1eaea378e4325e780a7285de998c33117470b23f96d917d04c0aed85f2387734408c52efa00a8b6bec7541b8927
DIST pandoc-2.13-linux-arm64.tar.gz 17044478 BLAKE2B 3a5c57bc0a01f07f0570cc5f4960746523bc4100ec7ae07f98741fab6e9655f3c73ba56a5c8031e4ce1aef3dbdf0644a3e4afe6eae72b568c168e7beb89df97f SHA512 771eafe2deb034e6c9efb9d8cd1241879d12a07f9a5b76579e581dc835737aa6bc61acfe239302f7b64ad4e57444f933083ef9852786d6c7122535f61ed01997

View File

@ -1,44 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
MY_PN="${PN//-bin/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Universal markup converter"
HOMEPAGE="https://pandoc.org"
SRC_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}-linux-amd64.tar.gz"
RESTRICT="mirror bindist"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-* ~amd64"
RDEPEND="
!app-text/${MY_PN}
"
S="${WORKDIR}/${MY_P}"
QA_PRESTRIPPED="
usr/bin/${MY_PN}
usr/bin/${MY_PN}-citeproc
"
src_unpack() {
default
# manpages are gzipped
find . -name "*.gz" | xargs gunzip
}
src_install() {
cd "${S}/bin" || die
dobin "${MY_PN}"
dobin "${MY_PN}-citeproc"
cd "${S}/share/man/man1" || die
doman "${MY_PN}.1"
doman "${MY_PN}-citeproc.1"
}

View File

@ -9,11 +9,7 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="Universal markup converter" DESCRIPTION="Universal markup converter"
HOMEPAGE="https://pandoc.org" HOMEPAGE="https://pandoc.org"
BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/" SRC_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}-linux-amd64.tar.gz"
SRC_URI="amd64? ( ${BASE_URI/${PV}/${MY_P}-linux-amd64.tar.gz} )
arm64? ( ${BASE_URI${PV}/${MY_P}-linux-arm64.tar.gz} )"
#https://github.com/jgm/pandoc/releases/download/2.13/pandoc-2.13-linux-arm64.tar.gz
RESTRICT="mirror bindist" RESTRICT="mirror bindist"
LICENSE="GPL-2" LICENSE="GPL-2"

View File

@ -9,10 +9,10 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="Universal markup converter" DESCRIPTION="Universal markup converter"
HOMEPAGE="https://pandoc.org" HOMEPAGE="https://pandoc.org"
BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/" BASE_URI="https://github.com/jgm/${MY_PN}/releases/download"
SRC_URI="amd64? ( ${BASE_URI/${PV}/${MY_P}-linux-amd64.tar.gz} ) SRC_URI="amd64? ( ${BASE_URI}/${PV}/${MY_P}-linux-amd64.tar.gz )
arm64? ( ${BASE_URI${PV}/${MY_P}-linux-arm64.tar.gz} )" arm64? ( ${BASE_URI}/${PV}/${MY_P}-linux-arm64.tar.gz )"
#https://github.com/jgm/pandoc/releases/download/2.13/pandoc-2.13-linux-arm64.tar.gz #https://github.com/jgm/pandoc/releases/download/2.13/pandoc-2.13-linux-arm64.tar.gz
RESTRICT="mirror bindist" RESTRICT="mirror bindist"