| 1 |
commit: f4237237343bf492a60130d7e2e84e8be2f4488f |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 2 20:06:58 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 2 20:06:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4237237 |
| 7 |
|
| 8 |
app-arch/pdv: update EAPI 6 -> 8 |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{pdv-1.5.1-r3.ebuild => pdv-1.5.1-r4.ebuild} | 47 +++++++++++----------- |
| 13 |
1 file changed, 24 insertions(+), 23 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-arch/pdv/pdv-1.5.1-r3.ebuild b/app-arch/pdv/pdv-1.5.1-r4.ebuild |
| 16 |
similarity index 63% |
| 17 |
rename from app-arch/pdv/pdv-1.5.1-r3.ebuild |
| 18 |
rename to app-arch/pdv/pdv-1.5.1-r4.ebuild |
| 19 |
index 8b712196c4de..b50f939fa91a 100644 |
| 20 |
--- a/app-arch/pdv/pdv-1.5.1-r3.ebuild |
| 21 |
+++ b/app-arch/pdv/pdv-1.5.1-r4.ebuild |
| 22 |
@@ -1,7 +1,8 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Foundation |
| 24 |
+# Copyright 1999-2022 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI=6 |
| 28 |
+EAPI=8 |
| 29 |
+ |
| 30 |
inherit autotools toolchain-funcs |
| 31 |
|
| 32 |
DESCRIPTION="build a self-extracting and self-installing binary package" |
| 33 |
@@ -11,48 +12,48 @@ SRC_URI="mirror://sourceforge/pdv/${P}.tar.gz" |
| 34 |
LICENSE="MIT" |
| 35 |
SLOT="0" |
| 36 |
KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos" |
| 37 |
-IUSE="X" |
| 38 |
+IUSE="gui" |
| 39 |
|
| 40 |
-DEPEND=" |
| 41 |
- X? ( |
| 42 |
+RDEPEND=" |
| 43 |
+ gui? ( |
| 44 |
>=x11-libs/motif-2.3:0 |
| 45 |
>=x11-libs/libX11-1.0.0 |
| 46 |
>=x11-libs/libXt-1.0.0 |
| 47 |
- >=x11-libs/libXext-1.0.0 ) |
| 48 |
-" |
| 49 |
-RDEPEND="${DEPEND}" |
| 50 |
- |
| 51 |
-src_prepare() { |
| 52 |
- default |
| 53 |
+ >=x11-libs/libXext-1.0.0 |
| 54 |
+ )" |
| 55 |
+DEPEND="${RDEPEND}" |
| 56 |
|
| 57 |
+PATCHES=( |
| 58 |
# fix a size-of-variable bug |
| 59 |
- eapply "${FILESDIR}"/${P}-opt.patch |
| 60 |
+ "${FILESDIR}"/${P}-opt.patch |
| 61 |
# fix a free-before-use bug |
| 62 |
- eapply "${FILESDIR}"/${P}-early-free.patch |
| 63 |
+ "${FILESDIR}"/${P}-early-free.patch |
| 64 |
# fix a configure script bug |
| 65 |
- eapply "${FILESDIR}"/${P}-x-config.patch |
| 66 |
+ "${FILESDIR}"/${P}-x-config.patch |
| 67 |
# fix default args bug from assuming 'char' is signed |
| 68 |
- eapply "${FILESDIR}"/${P}-default-args.patch |
| 69 |
+ "${FILESDIR}"/${P}-default-args.patch |
| 70 |
# prevent pre-stripped binaries |
| 71 |
- eapply "${FILESDIR}"/${P}-no-strip.patch |
| 72 |
+ "${FILESDIR}"/${P}-no-strip.patch |
| 73 |
+) |
| 74 |
+ |
| 75 |
+src_prepare() { |
| 76 |
+ default |
| 77 |
|
| 78 |
# re-build configure script since patch was applied to configure.in |
| 79 |
- cd "${S}"/X11 |
| 80 |
- mv configure.in configure.ac || die |
| 81 |
+ cd X11 || die |
| 82 |
eautoreconf |
| 83 |
- tc-export CC |
| 84 |
} |
| 85 |
|
| 86 |
src_configure() { |
| 87 |
- local myconf="" |
| 88 |
- use X || myconf="--without-x" # configure script is broken, cant use use_with |
| 89 |
- econf ${myconf} |
| 90 |
+ tc-export CC |
| 91 |
+ |
| 92 |
+ econf $(usev !gui --without-x) # configure script is broken, cant use use_with |
| 93 |
} |
| 94 |
|
| 95 |
src_install() { |
| 96 |
dobin pdv pdvmkpkg |
| 97 |
doman pdv.1 pdvmkpkg.1 |
| 98 |
- if use X ; then |
| 99 |
+ if use gui ; then |
| 100 |
dobin X11/xmpdvmkpkg |
| 101 |
doman xmpdvmkpkg.1 |
| 102 |
fi |
Archives