Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/, net-irc/weechat/files/
Date: Thu, 13 Dec 2018 06:48:41
Message-Id: 1544683634.fa5f777475b902cc5721e3c7db0f663f9040930c.radhermit@gentoo
1 commit: fa5f777475b902cc5721e3c7db0f663f9040930c
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 13 03:40:31 2018 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 13 06:47:14 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa5f7774
7
8 net-irc/weechat: remove old
9
10 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
11
12 net-irc/weechat/Manifest | 1 -
13 net-irc/weechat/files/weechat-1.2-tinfo.patch | 32 ------
14 net-irc/weechat/weechat-2.0.1.ebuild | 151 --------------------------
15 3 files changed, 184 deletions(-)
16
17 diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
18 index bbde3e37504..03f1ca58d69 100644
19 --- a/net-irc/weechat/Manifest
20 +++ b/net-irc/weechat/Manifest
21 @@ -1,2 +1 @@
22 -DIST weechat-2.0.1.tar.xz 1967336 BLAKE2B 256f4bab45834ed2798490234c9417b8b8e4d06d0ed09f5779ad9d32321ab9aec58c38f4b048de319e4f46809313186462208258ca2d78d1e0470fa2014e7472 SHA512 3947e79a0ac8dce7605905c39039bedf9ba2af4778ee6905f12ca75786b62f3081568ce9426be251e65bad2837ddcf0664cbb08059f898d4ac60171325a94e74
23 DIST weechat-2.3.tar.xz 2025652 BLAKE2B 74c5d81a77f164c51bee01ff1be5731455ad85178005a360269ffa4ac59554c58dc97175fcb3fa62841b79e7711c1dc41876a839a9d1e4a1f4ce359bac1d6689 SHA512 0de827850de5c70c528e1a8cfa44220c3d48d6767df61a8a6283123173ba63b4c8554d5334a8b14976d19602c36bbc27d89ebbd201ccd8c048d50edc3a4ea19b
24
25 diff --git a/net-irc/weechat/files/weechat-1.2-tinfo.patch b/net-irc/weechat/files/weechat-1.2-tinfo.patch
26 deleted file mode 100644
27 index e6ae9e0f205..00000000000
28 --- a/net-irc/weechat/files/weechat-1.2-tinfo.patch
29 +++ /dev/null
30 @@ -1,32 +0,0 @@
31 - src/gui/curses/CMakeLists.txt | 11 +++++++++--
32 - 1 file changed, 9 insertions(+), 2 deletions(-)
33 -
34 -diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
35 -index 284956f..492fc77 100644
36 ---- a/src/gui/curses/CMakeLists.txt
37 -+++ b/src/gui/curses/CMakeLists.txt
38 -@@ -35,7 +35,14 @@ main.c)
39 -
40 - set(EXECUTABLE weechat)
41 -
42 --find_package(Ncurses)
43 -+
44 -+find_package(PkgConfig)
45 -+pkg_search_module(NCURSES ncursesw ncurses)
46 -+
47 -+if(NOT NCURSES_FOUND)
48 -+ find_package(Ncurses)
49 -+endif(NCURSES_FOUND)
50 -+
51 - if(NCURSES_FOUND)
52 - check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
53 - if(NCURSESW_HEADERS)
54 -@@ -46,7 +53,7 @@ if(NCURSES_FOUND)
55 - add_definitions(-DHAVE_NCURSES_H)
56 - endif()
57 - endif()
58 -- list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY})
59 -+ list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY} ${NCURSES_LIBRARIES} )
60 - endif()
61 -
62 - if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
63
64 diff --git a/net-irc/weechat/weechat-2.0.1.ebuild b/net-irc/weechat/weechat-2.0.1.ebuild
65 deleted file mode 100644
66 index 1d1eec8e568..00000000000
67 --- a/net-irc/weechat/weechat-2.0.1.ebuild
68 +++ /dev/null
69 @@ -1,151 +0,0 @@
70 -# Copyright 1999-2018 Gentoo Foundation
71 -# Distributed under the terms of the GNU General Public License v2
72 -
73 -EAPI=6
74 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
75 -CMAKE_MAKEFILE_GENERATOR=emake
76 -inherit python-single-r1 cmake-utils
77 -
78 -if [[ ${PV} == "9999" ]] ; then
79 - inherit git-r3
80 - EGIT_REPO_URI="https://github.com/weechat/weechat.git"
81 -else
82 - SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
83 - KEYWORDS="amd64 x86 ~x64-macos"
84 -fi
85 -
86 -DESCRIPTION="Portable and multi-interface IRC client"
87 -HOMEPAGE="https://weechat.org/"
88 -
89 -LICENSE="GPL-3"
90 -SLOT="0"
91 -
92 -NETWORKS="+irc"
93 -PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
94 -# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
95 -SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
96 -LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
97 -IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
98 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
99 -
100 -RDEPEND="
101 - dev-libs/libgcrypt:0=
102 - net-misc/curl[ssl]
103 - sys-libs/ncurses:0=
104 - sys-libs/zlib
105 - charset? ( virtual/libiconv )
106 - guile? ( >=dev-scheme/guile-2.0 )
107 - lua? ( dev-lang/lua:0[deprecated] )
108 - nls? ( virtual/libintl )
109 - perl? ( dev-lang/perl:= )
110 - php? ( >=dev-lang/php-7.0:* )
111 - python? ( ${PYTHON_DEPS} )
112 - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
113 - ssl? ( net-libs/gnutls )
114 - spell? ( app-text/aspell )
115 - tcl? ( >=dev-lang/tcl-8.4.15:0= )
116 -"
117 -DEPEND="${RDEPEND}
118 - doc? (
119 - >=dev-ruby/asciidoctor-1.5.4
120 - dev-util/source-highlight
121 - )
122 - nls? ( >=sys-devel/gettext-0.15 )
123 - test? ( dev-util/cpputest )
124 -"
125 -
126 -DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
127 -
128 -# tests need to be fixed to not use system plugins if weechat is already installed
129 -RESTRICT="test"
130 -
131 -PATCHES=( "${FILESDIR}"/${PN}-1.2-tinfo.patch )
132 -
133 -pkg_setup() {
134 - use python && python-single-r1_pkg_setup
135 -}
136 -
137 -src_prepare() {
138 - cmake-utils_src_prepare
139 -
140 - # fix libdir placement
141 - sed -i \
142 - -e "s:lib/:$(get_libdir)/:g" \
143 - -e "s:lib\":$(get_libdir)\":g" \
144 - CMakeLists.txt || die "sed failed"
145 -
146 - # install only required translations
147 - local i
148 - for i in ${LANGS} ; do
149 - if ! has ${i} ${LINGUAS-${i}} ; then
150 - sed -i \
151 - -e "/${i}.po/d" \
152 - po/CMakeLists.txt || die
153 - fi
154 - done
155 -
156 - # install only required documentation ; en always
157 - for i in $(grep add_subdirectory doc/CMakeLists.txt \
158 - | sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
159 - if ! has ${i} ${LINGUAS-${i}} ; then
160 - sed -i \
161 - -e '/add_subdirectory('${i}')/d' \
162 - doc/CMakeLists.txt || die
163 - fi
164 - done
165 -
166 - # install docs in correct directory
167 - sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
168 -
169 - if [[ ${CHOST} == *-darwin* ]]; then
170 - # fix linking error on Darwin
171 - sed -i "s/+ get_config_var('LINKFORSHARED')//" \
172 - cmake/FindPython.cmake || die
173 - # allow to find the plugins by default
174 - sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
175 - src/core/wee-config.c || die
176 - fi
177 -}
178 -
179 -src_configure() {
180 - local mycmakeargs=(
181 - -DENABLE_NCURSES=ON
182 - -DENABLE_NLS=$(usex nls)
183 - -DENABLE_GNUTLS=$(usex ssl)
184 - -DENABLE_LARGEFILE=ON
185 - -DENABLE_ALIAS=$(usex alias)
186 - -DENABLE_ASPELL=$(usex spell)
187 - -DENABLE_BUFLIST=$(usex buflist)
188 - -DENABLE_CHARSET=$(usex charset)
189 - -DENABLE_EXEC=$(usex exec)
190 - -DENABLE_FSET=$(usex fset)
191 - -DENABLE_FIFO=$(usex fifo)
192 - -DENABLE_IRC=$(usex irc)
193 - -DENABLE_LOGGER=$(usex logger)
194 - -DENABLE_RELAY=$(usex relay)
195 - -DENABLE_SCRIPT=$(usex scripts)
196 - -DENABLE_SCRIPTS=$(usex scripts)
197 - -DENABLE_PERL=$(usex perl)
198 - -DENABLE_PHP=$(usex php)
199 - -DENABLE_PYTHON=$(usex python)
200 - -DENABLE_RUBY=$(usex ruby)
201 - -DENABLE_LUA=$(usex lua)
202 - -DENABLE_TCL=$(usex tcl)
203 - -DENABLE_GUILE=$(usex guile)
204 - -DENABLE_JAVASCRIPT=OFF
205 - -DENABLE_TRIGGER=$(usex trigger)
206 - -DENABLE_XFER=$(usex xfer)
207 - -DENABLE_DOC=$(usex doc)
208 - -DENABLE_TESTS=$(usex test)
209 - )
210 -
211 - if use python; then
212 - python_export PYTHON_LIBPATH
213 - mycmakeargs+=(
214 - -DPYTHON_EXECUTABLE="${PYTHON}"
215 - -DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
216 - )
217 - fi
218 -
219 - cmake-utils_src_configure
220 -}