* [gentoo-commits] repo/gentoo:master commit in: net-misc/vncsnapshot/
@ 2020-09-14 22:27 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-09-14 22:27 UTC (permalink / raw
To: gentoo-commits
commit: bc7f74e1dff8f3dd67bb1167e768909636dfb86d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 22:26:58 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 22:26:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc7f74e1
net-misc/vncsnapshot: EAPI 7, respect tc variables
* EAPI 4->7
* Respect AR, RANLIB
* Don't clobber make (call $(MAKE) so jobserver persists)
Closes: https://bugs.gentoo.org/742149
Closes: https://bugs.gentoo.org/725208
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild | 34 +++++++++++++++++++++-------
1 file changed, 26 insertions(+), 8 deletions(-)
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
index 221b1344f24..41283434b79 100644
--- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
+++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers"
HOMEPAGE="http://vncsnapshot.sourceforge.net/"
@@ -12,32 +12,50 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ppc x86"
-IUSE=""
DEPEND="
virtual/jpeg
>=sys-libs/zlib-1.1.4"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${P}-amd64grey.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}/${P}-amd64grey.patch"
+ default
+
sed \
-e 's:-I/usr/local/include::g' \
-e 's:-L/usr/local/lib::g' \
-e '/^all:/s|$(SUBDIRS:.dir=.all)||g' \
-e '/^vnc/s|$| $(SUBDIRS:.dir=.all)|g' \
-i Makefile || die
+
+ # Preserve make instance
+ sed -i -e 's/make/$(MAKE)/' Makefile || die
+
+ # Respect RANLIB
+ sed -i -e 's/ranlib/$(RANLIB)/' rdr/Makefile || die
}
src_compile() {
- #note: We override CDEBUGFLAGS instead of CFLAGS because otherwise
- # we lost the INCLUDES in the makefile.
+ # Note: We override CDEBUGFLAGS instead of CFLAGS because otherwise
+ # we lose the INCLUDES in the makefile.
# bug #295741
- emake CDEBUGFLAGS="${CXXFLAGS}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ local args=(
+ AR="$(tc-getAR)"
+ CDEBUGFLAGS="${CXXFLAGS}"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ RANLIB="$(tc-getRANLIB)"
+ )
+ emake "${args[@]}"
}
src_install() {
dobin vncsnapshot
- cp vncsnapshot.man1 vncsnapshot.1
+
+ cp vncsnapshot.man1 vncsnapshot.1 || die
doman vncsnapshot.1
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vncsnapshot/
@ 2020-09-14 22:32 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-09-14 22:32 UTC (permalink / raw
To: gentoo-commits
commit: 82351a164b9efc821fd8b85a035375f8c8580abd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 22:31:59 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 22:32:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82351a16
net-misc/vncsnapshot: sort
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
index 41283434b79..133346f838c 100644
--- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
+++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
@@ -14,8 +14,9 @@ SLOT="0"
KEYWORDS="~amd64 ppc x86"
DEPEND="
+ sys-libs/zlib
virtual/jpeg
- >=sys-libs/zlib-1.1.4"
+"
RDEPEND="${DEPEND}"
PATCHES=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vncsnapshot/
@ 2020-09-14 22:51 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-09-14 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 2e024f67875b7a2c1bbb4122796aee372de2f805
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 22:51:42 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 22:51:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e024f67
net-misc/vncsnapshot: simplify ebuild
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
index 133346f838c..91d250b58b9 100644
--- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
+++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
@@ -41,8 +41,9 @@ src_prepare() {
}
src_compile() {
- # Note: We override CDEBUGFLAGS instead of CFLAGS because otherwise
- # we lose the INCLUDES in the makefile.
+ # We override CDEBUGFLAGS instead of CFLAGS because otherwise
+ # we lose the INCLUDES in the makefile. The same flags are used
+ # for both.
# bug #295741
local args=(
AR="$(tc-getAR)"
@@ -56,7 +57,5 @@ src_compile() {
src_install() {
dobin vncsnapshot
-
- cp vncsnapshot.man1 vncsnapshot.1 || die
- doman vncsnapshot.1
+ newman vncsnapshot.man1 vncsnapshot.1
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vncsnapshot/
@ 2023-06-10 13:47 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-06-10 13:47 UTC (permalink / raw
To: gentoo-commits
commit: d122800ea077150507b9a0cb2c699bf08dd5a1d4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 13:47:11 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 13:47:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d122800e
net-misc/vncsnapshot: Keyword 1.2a arm64, #908228
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
index 91d250b58b94..082dd8ddf017 100644
--- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
+++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~arm64 ppc x86"
DEPEND="
sys-libs/zlib
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vncsnapshot/
@ 2024-09-24 6:58 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2024-09-24 6:58 UTC (permalink / raw
To: gentoo-commits
commit: 200c09d61699a4949ad4090fee020193b01509ba
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Sep 4 13:16:08 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 06:57:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=200c09d6
net-misc/vncsnapshot: EAPI8 bump, fix LICENSE, use https
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/38429
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-misc/vncsnapshot/vncsnapshot-1.2a-r1.ebuild | 61 +++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a-r1.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a-r1.ebuild
new file mode 100644
index 000000000000..766b4da94e0b
--- /dev/null
+++ b/net-misc/vncsnapshot/vncsnapshot-1.2a-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Command-line tool for taking JPEG snapshots of VNC servers"
+HOMEPAGE="https://vncsnapshot.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+
+DEPEND="
+ media-libs/libjpeg-turbo:=
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-amd64grey.patch"
+)
+
+src_prepare() {
+ default
+
+ sed \
+ -e 's:-I/usr/local/include::g' \
+ -e 's:-L/usr/local/lib::g' \
+ -e '/^all:/s|$(SUBDIRS:.dir=.all)||g' \
+ -e '/^vnc/s|$| $(SUBDIRS:.dir=.all)|g' \
+ -i Makefile || die
+
+ # Preserve make instance
+ sed -i -e 's/make/$(MAKE)/' Makefile || die
+
+ # Respect RANLIB
+ sed -i -e 's/ranlib/$(RANLIB)/' rdr/Makefile || die
+}
+
+src_compile() {
+ # We override CDEBUGFLAGS instead of CFLAGS because otherwise
+ # we lose the INCLUDES in the makefile. The same flags are used
+ # for both.
+ # bug #295741
+ local args=(
+ AR="$(tc-getAR)"
+ CDEBUGFLAGS="${CXXFLAGS}"
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ RANLIB="$(tc-getRANLIB)"
+ )
+ emake "${args[@]}"
+}
+
+src_install() {
+ dobin vncsnapshot
+ newman vncsnapshot.man1 vncsnapshot.1
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-24 6:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-14 22:51 [gentoo-commits] repo/gentoo:master commit in: net-misc/vncsnapshot/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-24 6:58 Joonas Niilola
2023-06-10 13:47 Sam James
2020-09-14 22:32 Sam James
2020-09-14 22:27 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox