app-misc/vcp: Fix compiling against sys-libs/ncurses[tinfo] (bug #633744).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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 (file)
index 0000000..715b6f1
--- /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 a7d1a6493b66664a10c0faf49ddbc9a7f5bbc0f5..469e80c56dd494afaf9439aeaf478c878cc52f15 100644 (file)
--- 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() {