[gentoo-commits] repo/gentoo:master commit in: app-misc/vcp/files/, app-misc/vcp/
commit: e125c1114ab32762846f27af587a8bdb22a985ef
Author: Jakov Smolic sartura hr>
AuthorDate: Mon Dec 28 14:47:51 2020 +
Commit: David Seifert gentoo org>
CommitDate: Mon Dec 28 14:47:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e125c111
app-misc/vcp: Port to EAPI 7
Closes: https://bugs.gentoo.org/707464
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
app-misc/vcp/files/vcp-2.2-fno-common.patch | 47 +
app-misc/vcp/vcp-2.2-r2.ebuild | 8 +++--
2 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/app-misc/vcp/files/vcp-2.2-fno-common.patch
b/app-misc/vcp/files/vcp-2.2-fno-common.patch
new file mode 100644
index 000..394cbaede85
--- /dev/null
+++ b/app-misc/vcp/files/vcp-2.2-fno-common.patch
@@ -0,0 +1,47 @@
+--- a/common.h
b/common.h
+@@ -23,8 +23,8 @@
+ #define T_DIR 1 /* -> DIR */
+ #define T_NED 2 /* DIR -> NON-EXISTENT DIR */
+
+-WINDOW *mainw;
+-WINDOW *logw;
++extern WINDOW *mainw;
++extern WINDOW *logw;
+
+ struct dest_new {
+ char *opath;
+--- a/log.c
b/log.c
+@@ -13,6 +13,8 @@
+ #include "screen.h"
+ #include "color.h"
+
++extern WINDOW *logw;
++
+ int logaddi(int code, char *base, int var, int var2) {
+
+ if(code == LOG_VRB && !vflag)
+--- a/misc.c
b/misc.c
+@@ -22,6 +22,8 @@
+ #include "color.h"
+ #include "screen.h"
+
++extern WINDOW *logw;
++
+ int statit(char *path,struct stat *st,int cmdline) {
+ if(Rflag) {
+ if(pflag || ((Hflag) && !cmdline))
+--- a/screen.c
b/screen.c
+@@ -17,6 +17,9 @@
+ int winw,winh,mainww;
+ int mainwsbw; /* width of status bar */
+
++WINDOW *mainw;
++WINDOW *logw;
++
+ /* create windows, draw border and title */
+ void scrn_draw() {
+ int dev_null;
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
index c53cc103faa..686e5ab2df4 100644
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic toolchain-funcs
@@ -17,8 +17,10 @@ DEPEND="sys-libs/ncurses:0="
RDEPEND="${DEPEND}"
DOCS=( Changelog README INSTALL )
+
PATCHES=(
- "${FILESDIR}"/${PN}-2.2-tinfo.patch
+ "${FILESDIR}"/${P}-tinfo.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_compile() {
[gentoo-commits] repo/gentoo:master commit in: app-misc/vcp/
commit: 0268e0ffa51f29475e1a578ec32767b13966cea6
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Mar 13 22:23:26 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Mar 13 22:26:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0268e0ff
app-misc/vcp: x86 stable (bug #648108)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-misc/vcp/vcp-2.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
index 7fbe72c85f8..a430bd10e3b 100644
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz;
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86"
DEPEND="sys-libs/ncurses:0="
RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: app-misc/vcp/, app-misc/vcp/files/
commit: d4df6c3792af4f37875e8a1a215e394e4f49b8ae
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Feb 25 16:19:45 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Feb 25 16:19:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4df6c37
app-misc/vcp: Fix compiling against sys-libs/ncurses[tinfo] (bug #633744).
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-misc/vcp/files/vcp-2.2-tinfo.patch | 11 +++
app-misc/vcp/vcp-2.2-r2.ebuild | 10 --
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/app-misc/vcp/files/vcp-2.2-tinfo.patch
b/app-misc/vcp/files/vcp-2.2-tinfo.patch
new file mode 100644
index 000..715b6f1a658
--- /dev/null
+++ b/app-misc/vcp/files/vcp-2.2-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
b/Makefile
+@@ -4,7 +4,7 @@
+ OBJS = main.o copyall.o copy.o screen.o log.o path.o misc.o color.o
+
+ all: $(OBJS)
+- $(CC) $(CFLAGS) -o vcp $(OBJS) -lcurses
++ $(CC) $(CFLAGS) $(LDFLAGS) -o vcp $(OBJS) $(shell $(PKG_CONFIG) --libs
ncurses)
+
+ .c.o:
+ $(CC) $(CFLAGS) -c -I/usr/include/ -o $@ $<
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
index a7d1a6493b6..469e80c56dd 100644
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -17,15 +17,13 @@ DEPEND="sys-libs/ncurses:0="
RDEPEND="${DEPEND}"
DOCS=( Changelog README INSTALL )
-
-src_prepare() {
- default
- sed -i Makefile -e '/-o vcp/s|$(CFLAGS)|& $(LDFLAGS)|' || die "sed
Makefile"
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2-tinfo.patch
+)
src_compile() {
filter-lfs-flags
- emake CC="$(tc-getCC)"
+ emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: app-misc/vcp/
commit: 07fce25a6df6bf15929673926405950b0af34079
Author: Mart Raudsepp gentoo org>
AuthorDate: Fri Jan 5 00:41:00 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Jan 5 01:06:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07fce25a
app-misc/vcp-2.2-r2: add ~arm64 keyword
Closes: https://bugs.gentoo.org/642646
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-misc/vcp/vcp-2.2-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
index dd7ce777d9a..a7d1a6493b6 100644
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz;
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
DEPEND="sys-libs/ncurses:0="
RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: app-misc/vcp/
commit: 90ee2aa04af7b573f403944df6c6257bfb29ed0f
Author: Benda Xu gentoo org>
AuthorDate: Sun Jun 11 11:08:20 2017 +
Commit: Benda XU gentoo org>
CommitDate: Sun Jun 11 11:09:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90ee2aa0
app-misc/vcp: keyword ~arm
Bug: 621346
Credit: Conrad Kostecki
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-misc/vcp/vcp-2.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
index 5dfcf3a9d74..dd7ce777d9a 100644
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz;
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
DEPEND="sys-libs/ncurses:0="
RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: app-misc/vcp/
commit: 0b4a7192210595ac535424740926f7a4eea2100b
Author: Patrice Clement gentoo org>
AuthorDate: Sun Jan 8 22:08:50 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Jan 8 22:08:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b4a7192
app-misc/vcp: EAPI 6 bump.
Package-Manager: portage-2.3.0
app-misc/vcp/vcp-2.2-r2.ebuild | 38 ++
1 file changed, 38 insertions(+)
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
new file mode 100644
index ..506ddf1
--- /dev/null
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Copy files/directories in a curses interface"
+HOMEPAGE="http://members.iinet.net.au/~lynx/vcp/;
+SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+DOCS=( Changelog README INSTALL )
+
+src_prepare() {
+ default
+ sed -i Makefile -e '/-o vcp/s|$(CFLAGS)|& $(LDFLAGS)|' || die "sed
Makefile"
+}
+
+src_compile() {
+ filter-lfs-flags
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ insinto /etc
+ newins "${PN}.conf.sample" "${PN}.conf"
+ einstalldocs
+}
