| 1 |
commit: bc7f74e1dff8f3dd67bb1167e768909636dfb86d |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 14 22:26:58 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 14 22:26:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc7f74e1 |
| 7 |
|
| 8 |
net-misc/vncsnapshot: EAPI 7, respect tc variables |
| 9 |
|
| 10 |
* EAPI 4->7 |
| 11 |
* Respect AR, RANLIB |
| 12 |
* Don't clobber make (call $(MAKE) so jobserver persists) |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/742149 |
| 15 |
Closes: https://bugs.gentoo.org/725208 |
| 16 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild | 34 +++++++++++++++++++++------- |
| 20 |
1 file changed, 26 insertions(+), 8 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild |
| 23 |
index 221b1344f24..41283434b79 100644 |
| 24 |
--- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild |
| 25 |
+++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild |
| 26 |
@@ -1,9 +1,9 @@ |
| 27 |
# Copyright 1999-2020 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
-EAPI=4 |
| 31 |
+EAPI=7 |
| 32 |
|
| 33 |
-inherit eutils toolchain-funcs |
| 34 |
+inherit toolchain-funcs |
| 35 |
|
| 36 |
DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers" |
| 37 |
HOMEPAGE="http://vncsnapshot.sourceforge.net/" |
| 38 |
@@ -12,32 +12,50 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" |
| 39 |
LICENSE="GPL-2" |
| 40 |
SLOT="0" |
| 41 |
KEYWORDS="~amd64 ppc x86" |
| 42 |
-IUSE="" |
| 43 |
|
| 44 |
DEPEND=" |
| 45 |
virtual/jpeg |
| 46 |
>=sys-libs/zlib-1.1.4" |
| 47 |
RDEPEND="${DEPEND}" |
| 48 |
|
| 49 |
+PATCHES=( |
| 50 |
+ "${FILESDIR}/${P}-amd64grey.patch" |
| 51 |
+) |
| 52 |
+ |
| 53 |
src_prepare() { |
| 54 |
- epatch "${FILESDIR}/${P}-amd64grey.patch" |
| 55 |
+ default |
| 56 |
+ |
| 57 |
sed \ |
| 58 |
-e 's:-I/usr/local/include::g' \ |
| 59 |
-e 's:-L/usr/local/lib::g' \ |
| 60 |
-e '/^all:/s|$(SUBDIRS:.dir=.all)||g' \ |
| 61 |
-e '/^vnc/s|$| $(SUBDIRS:.dir=.all)|g' \ |
| 62 |
-i Makefile || die |
| 63 |
+ |
| 64 |
+ # Preserve make instance |
| 65 |
+ sed -i -e 's/make/$(MAKE)/' Makefile || die |
| 66 |
+ |
| 67 |
+ # Respect RANLIB |
| 68 |
+ sed -i -e 's/ranlib/$(RANLIB)/' rdr/Makefile || die |
| 69 |
} |
| 70 |
|
| 71 |
src_compile() { |
| 72 |
- #note: We override CDEBUGFLAGS instead of CFLAGS because otherwise |
| 73 |
- # we lost the INCLUDES in the makefile. |
| 74 |
+ # Note: We override CDEBUGFLAGS instead of CFLAGS because otherwise |
| 75 |
+ # we lose the INCLUDES in the makefile. |
| 76 |
# bug #295741 |
| 77 |
- emake CDEBUGFLAGS="${CXXFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" |
| 78 |
+ local args=( |
| 79 |
+ AR="$(tc-getAR)" |
| 80 |
+ CDEBUGFLAGS="${CXXFLAGS}" |
| 81 |
+ CC="$(tc-getCC)" |
| 82 |
+ CXX="$(tc-getCXX)" |
| 83 |
+ RANLIB="$(tc-getRANLIB)" |
| 84 |
+ ) |
| 85 |
+ emake "${args[@]}" |
| 86 |
} |
| 87 |
|
| 88 |
src_install() { |
| 89 |
dobin vncsnapshot |
| 90 |
- cp vncsnapshot.man1 vncsnapshot.1 |
| 91 |
+ |
| 92 |
+ cp vncsnapshot.man1 vncsnapshot.1 || die |
| 93 |
doman vncsnapshot.1 |
| 94 |
} |
Archives