Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/ncdc/, net-p2p/ncdc/files/
Date: Thu, 07 Jan 2021 11:33:32
Message-Id: 1610019195.63ba5a24824757a21e46b4a3069a87982e34c850.sam@gentoo
1 commit: 63ba5a24824757a21e46b4a3069a87982e34c850
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 7 11:21:46 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 7 11:33:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ba5a24
7
8 net-p2p/ncdc: cleanup old
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 net-p2p/ncdc/Manifest | 1 -
14 net-p2p/ncdc/files/ncdc-1.21-tinfo.patch | 53 ----------------------------
15 net-p2p/ncdc/ncdc-1.21.ebuild | 60 --------------------------------
16 3 files changed, 114 deletions(-)
17
18 diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
19 index 6d3f20791f1..e3553ce0116 100644
20 --- a/net-p2p/ncdc/Manifest
21 +++ b/net-p2p/ncdc/Manifest
22 @@ -1,2 +1 @@
23 -DIST ncdc-1.21.tar.gz 370452 BLAKE2B 55ee9943a7adec4c60d17a8782ed9b2337796c0875c3c316e4f1627015520c5b8b23673b183a0f1d7e4c7a367eac5d908fb30e6b2d08caa324d19caf93efc7a4 SHA512 de182e190e3fb26451aad403975ec232b14ce908633cb2d9713582e2af8555fb55e2ea7de160b5b7faa05558f25dac0700dabbf5b7d1acd1aaa26d1bfe033c0c
24 DIST ncdc-1.22.1.tar.gz 371572 BLAKE2B 22125062a42f77e8a7a8afc699523b27a2b7ec566891676ca13b415e93cdae8e2d8d38f303070c7f098408f537266404a875b9ed7f9931a39933916a0ba576ab SHA512 b084ee28a799705009600c450016719ebb992cb0bf7e026513f4cd7e93b2566e7bf8e352eec92f3d69612ce06c930587759d7f7d20d14ee9fe1d5c4b8c4393af
25
26 diff --git a/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch b/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
27 deleted file mode 100644
28 index 0e5acac59d5..00000000000
29 --- a/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
30 +++ /dev/null
31 @@ -1,53 +0,0 @@
32 -From 16466392884a623fd93907f4d1071211e8ba48a4 Mon Sep 17 00:00:00 2001
33 -From: Lars Wendler <polynomial-c@g.o>
34 -Date: Mon, 8 Apr 2019 13:58:42 +0200
35 -Subject: [PATCH] Fix build against ncurses with separate libtinfo
36 -
37 -by using PKG_CHECK_MODULES instead of AC_CHECK_LIB
38 -
39 -Signed-off-by: Lars Wendler <polynomial-c@g.o>
40 ----
41 - configure.ac | 20 +++++---------------
42 - 1 file changed, 5 insertions(+), 15 deletions(-)
43 -
44 -diff --git a/configure.ac b/configure.ac
45 -index c774316..d0c0430 100644
46 ---- a/configure.ac
47 -+++ b/configure.ac
48 -@@ -30,12 +30,6 @@ AM_CONDITIONAL([HAVE_MH], [test "x$have_mh" = "xyes"])
49 - # Check for header files.
50 - AC_CHECK_HEADERS([zlib.h bzlib.h],[], AC_MSG_ERROR([Required header file not found]))
51 -
52 --have_nch=no
53 --AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses/ncurses.h ncurses.h],[have_nch=yes])
54 --if test "x$have_nch" = "xno"; then
55 -- AC_MSG_ERROR([Could not find a header files for ncurses.])
56 --fi
57 --
58 -
59 - # Check for posix_fadvise()
60 - AC_CHECK_FUNCS([posix_fadvise])
61 -@@ -95,15 +89,11 @@ esac
62 -
63 -
64 - # Check for ncurses
65 --AC_CHECK_LIB([ncursesw], [get_wch], [
66 -- AC_SUBST([NCURSES_LIBS],[-lncursesw])
67 -- ], [
68 -- AC_CHECK_LIB([ncurses],
69 -- [get_wch],
70 -- [AC_SUBST([NCURSES_LIBS],[-lncurses])],
71 -- [AC_MSG_ERROR(ncursesw library is required)])
72 -- ]
73 --)
74 -+PKG_CHECK_MODULES(NCURSES, ncursesw,,[
75 -+ PKG_CHECK_MODULES(NCURSES, ncurses,,[
76 -+ AC_MSG_ERROR(ncurses library is required)
77 -+ ])
78 -+])
79 -
80 - # Check for zlib
81 - AC_CHECK_LIB([z],
82 ---
83 -2.21.0
84 -
85
86 diff --git a/net-p2p/ncdc/ncdc-1.21.ebuild b/net-p2p/ncdc/ncdc-1.21.ebuild
87 deleted file mode 100644
88 index 33a396fa7dc..00000000000
89 --- a/net-p2p/ncdc/ncdc-1.21.ebuild
90 +++ /dev/null
91 @@ -1,60 +0,0 @@
92 -# Copyright 1999-2020 Gentoo Authors
93 -# Distributed under the terms of the GNU General Public License v2
94 -
95 -EAPI=7
96 -
97 -inherit autotools toolchain-funcs
98 -
99 -DESCRIPTION="ncurses directconnect client"
100 -HOMEPAGE="https://dev.yorhel.nl/ncdc"
101 -if [[ "${PV}" == *9999 ]] ; then
102 - inherit git-r3
103 - EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
104 -else
105 - SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
106 - KEYWORDS="amd64 ~ppc ~sparc x86"
107 -fi
108 -
109 -LICENSE="MIT"
110 -SLOT="0"
111 -IUSE="geoip"
112 -
113 -RDEPEND="
114 - app-arch/bzip2
115 - dev-db/sqlite:3
116 - dev-libs/glib:2
117 - net-libs/gnutls:=
118 - sys-libs/ncurses:0=[unicode]
119 - sys-libs/zlib:=
120 - geoip? (
121 - dev-libs/geoip
122 - dev-libs/libmaxminddb
123 - )"
124 -DEPEND="${RDEPEND}"
125 -BDEPEND="
126 - dev-util/makeheaders
127 - virtual/pkgconfig
128 -"
129 -
130 -PATCHES=(
131 - "${FILESDIR}/${PN}-1.21-tinfo.patch"
132 -)
133 -
134 -src_prepare() {
135 - default
136 - eautoreconf
137 -}
138 -
139 -src_configure() {
140 - local myeconfargs=(
141 - $(use_with geoip)
142 - )
143 - if [[ "${PV}" == *9999 ]] ; then
144 - myeconfargs+=( --enable-git-version )
145 - fi
146 - econf "${myeconfargs[@]}"
147 -}
148 -
149 -src_compile() {
150 - emake AR="$(tc-getAR)"
151 -}