diff options
Diffstat (limited to 'app-arch/pdv')
| -rw-r--r-- | app-arch/pdv/Manifest | 2 | ||||
| -rw-r--r-- | app-arch/pdv/pdv-1.5.1-r4.ebuild (renamed from app-arch/pdv/pdv-1.5.1-r3.ebuild) | 47 |
2 files changed, 25 insertions, 24 deletions
diff --git a/app-arch/pdv/Manifest b/app-arch/pdv/Manifest index 345edf918cc7..9d0c39c22cd0 100644 --- a/app-arch/pdv/Manifest +++ b/app-arch/pdv/Manifest @@ -4,5 +4,5 @@ AUX pdv-1.5.1-no-strip.patch 419 BLAKE2B 94d963ecc43585f6d2d359a8cf23f6ecaf12d19 AUX pdv-1.5.1-opt.patch 696 BLAKE2B 83503bcba43c43f06e2e60791a0b4166c994206d767d35c7bd541204f00ae4777e1cfe31acef0d28fbd7c5d8c23d70fff13553a0e2bee0b1379860b8a68fa18e SHA512 bbe6cece336f649970227a577d17835b401262e9d6021a61d97dee69972826466b720e5f9b60d552d84e1223003fcf047314390afdf48e07f4b2c55868caf599 AUX pdv-1.5.1-x-config.patch 529 BLAKE2B cbdec2a9d9a512534ea5be14a2557d7cb0d89da8732adfd77b48de0a6881473ea95a9e5472f8efc8dce18aa55a28337921b06ef8bb8ad14dffc734ef0d822212 SHA512 7be234893169656537c15a124d5a50de138e85d2d23ab5884d600399f3aba86724ebac397846d03992a4556e7ca8a8ba42f5cf8c3e4348080e4c9e0522e05cb6 DIST pdv-1.5.1.tar.gz 87858 BLAKE2B b0397e177803ed57a69fd69a331b61743379be5ff4272fa5b03012856e9bf5a671e67701215964aabf8d57836da350bf66db20c81985e5f6949bbc9cafbda11c SHA512 c8db9aa4c29016474d33111e8343174a1fb25f152517bceb29428def5e02590b1de523ffcf2c0f6ffbaec5b357e3893f48188775c2e66d343a21e04343b1d0e9 -EBUILD pdv-1.5.1-r3.ebuild 1420 BLAKE2B a2185d1edcc325de5b26f1dfc33c0d6d6dfc91c2d6c59da038ec07c8655e6ad0ad69ce5abfa820c0c5e686bb5b289c22e89b8d5c88ff916690bcb03582edac55 SHA512 f52996ffa01d64ec5e883250187a4ea351f7d411fc5ad6cd0208707554a807a93b01b4304fcf787dcba26020c01fb7fe26326cad3aef037c5a0fb1e877ae11fa +EBUILD pdv-1.5.1-r4.ebuild 1333 BLAKE2B 70893c6d8c7e5b13133f169edf60e278b2b38f371c7bad2c6d6c9821eb95ae08b030f5bf648617b2f23a1e485504c12535ba5e17177bf03946c07e70451be036 SHA512 e7d221d9425b79f8419d861523da8f3d78d34d8cd80f252f8939def9d314fa33488e8ae24d0ba68b85c8e1f8695136776a6fdb259e3b83ec1040a42767a7c323 MISC metadata.xml 241 BLAKE2B 1e13023492f2426db80ee90a5464ecf1f693d957ef0542b2056dd1192034ac221274fd567c7670b855aee6f8627a4bbb48f2dd742d1e20b694d64fd49668c01f SHA512 d0c4ed2f7603606fa507fe29346d101d3dd07d59029067cdf65c63dc2859c99f72a56e56cd5f04e5e1bb9246ce68d6432fc38e991517ba484508e352f8637e01 diff --git a/app-arch/pdv/pdv-1.5.1-r3.ebuild b/app-arch/pdv/pdv-1.5.1-r4.ebuild index 8b712196c4de..b50f939fa91a 100644 --- a/app-arch/pdv/pdv-1.5.1-r3.ebuild +++ b/app-arch/pdv/pdv-1.5.1-r4.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools toolchain-funcs DESCRIPTION="build a self-extracting and self-installing binary package" @@ -11,48 +12,48 @@ SRC_URI="mirror://sourceforge/pdv/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos" -IUSE="X" +IUSE="gui" -DEPEND=" - X? ( +RDEPEND=" + gui? ( >=x11-libs/motif-2.3:0 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 - >=x11-libs/libXext-1.0.0 ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default + >=x11-libs/libXext-1.0.0 + )" +DEPEND="${RDEPEND}" +PATCHES=( # fix a size-of-variable bug - eapply "${FILESDIR}"/${P}-opt.patch + "${FILESDIR}"/${P}-opt.patch # fix a free-before-use bug - eapply "${FILESDIR}"/${P}-early-free.patch + "${FILESDIR}"/${P}-early-free.patch # fix a configure script bug - eapply "${FILESDIR}"/${P}-x-config.patch + "${FILESDIR}"/${P}-x-config.patch # fix default args bug from assuming 'char' is signed - eapply "${FILESDIR}"/${P}-default-args.patch + "${FILESDIR}"/${P}-default-args.patch # prevent pre-stripped binaries - eapply "${FILESDIR}"/${P}-no-strip.patch + "${FILESDIR}"/${P}-no-strip.patch +) + +src_prepare() { + default # re-build configure script since patch was applied to configure.in - cd "${S}"/X11 - mv configure.in configure.ac || die + cd X11 || die eautoreconf - tc-export CC } src_configure() { - local myconf="" - use X || myconf="--without-x" # configure script is broken, cant use use_with - econf ${myconf} + tc-export CC + + econf $(usev !gui --without-x) # configure script is broken, cant use use_with } src_install() { dobin pdv pdvmkpkg doman pdv.1 pdvmkpkg.1 - if use X ; then + if use gui ; then dobin X11/xmpdvmkpkg doman xmpdvmkpkg.1 fi |