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-im/toxic/, net-im/toxic/files/
Date: Fri, 07 Jan 2022 05:15:16
Message-Id: 1641531979.2aa83595c25847b0df884935a90bbe2f94eb17c0.sam@gentoo
1 commit: 2aa83595c25847b0df884935a90bbe2f94eb17c0
2 Author: Josiah Mullins <JoMull01 <AT> protonmail <DOT> com>
3 AuthorDate: Tue Dec 21 21:59:39 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 7 05:06:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa83595
7
8 net-im/toxic: Removed old version 0.8.3
9
10 Closes: https://bugs.gentoo.org/827058
11 Signed-off-by: Josiah Mullins <JoMull01 <AT> protonmail.com>
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 net-im/toxic/Manifest | 1 -
15 .../files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch | 49 -------------
16 net-im/toxic/toxic-0.8.3-r3.ebuild | 85 ----------------------
17 3 files changed, 135 deletions(-)
18
19 diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
20 index 5f20858fcd7b..4247de967283 100644
21 --- a/net-im/toxic/Manifest
22 +++ b/net-im/toxic/Manifest
23 @@ -1,3 +1,2 @@
24 DIST toxic-0.10.1.tar.gz 1165118 BLAKE2B d367039bef9c97c23c8e5453b607cf72f70776e8c86c41da0480eb04725a901bf33bb89727aee3010ad97d33ef2aa653ff09ea49b597cdf2008ff976c395065c SHA512 aec2e6612d639e0210ae68db3368b656647575e3d927444d0726422ff2cf9718dd5a8b3f37a8253cdc3714f09f9f96828dfccf7a7ae12f8a41ce3207f92a684d
25 DIST toxic-0.11.1.tar.gz 1204163 BLAKE2B 1e388982236badf1a27cb1cfd9e84ec635be6a576a0719a7394f32ac82f23796f94236ab807180620cbfa8c0c42f43ff244d2d99d27cd5ab3258c1ce69acc545 SHA512 53fba05271020547e779d63bea777f90f56b61e3eb2775afabe92e047a8347b4a9166628bb59d2eaab2e36a1121d791206ac68ff6604cb06fac6aaddbb05e787
26 -DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
27
28 diff --git a/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
29 deleted file mode 100644
30 index 11dc43c6b778..000000000000
31 --- a/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
32 +++ /dev/null
33 @@ -1,49 +0,0 @@
34 -diff -ruN src/autocomplete.c src/autocomplete.c
35 ---- src/autocomplete.c 2021-07-26 10:43:37.453154392 -0400
36 -+++ src/autocomplete.c 2021-07-26 10:59:29.856460938 -0400
37 -@@ -27,8 +27,11 @@
38 - #ifdef __APPLE__
39 - #include <sys/types.h>
40 - #include <sys/dir.h>
41 --#else
42 -+//This include NAME_MAX
43 -+#include <sys/sysinfo.h>
44 -+#elif __linux__
45 - #include <dirent.h>
46 -+#include <linux/limits.h>//This includes NAME_MAX
47 - #endif /* __APPLE__ */
48 -
49 - #include "windows.h"
50 -diff -ruN src/file_transfers.h src/file_transfers.h
51 ---- src/file_transfers.h 2021-07-26 10:43:37.456487724 -0400
52 -+++ src/file_transfers.h 2021-07-26 11:41:30.513057111 -0400
53 -@@ -24,6 +24,12 @@
54 - #define FILE_TRANSFERS_H
55 -
56 - #include <limits.h>
57 -+//This includes PATH_MAX
58 -+#ifdef __APPLE__
59 -+#include <sys/sysinfo.h>
60 -+#elif __linux__
61 -+#include <linux/limits.h>
62 -+#endif
63 -
64 - #include "toxic.h"
65 - #include "windows.h"
66 -diff -ruN src/settings.h src/settings.h
67 ---- src/settings.h 2021-07-26 10:43:37.459821058 -0400
68 -+++ src/settings.h 2021-07-26 11:45:46.709716594 -0400
69 -@@ -25,6 +25,13 @@
70 -
71 - #include <limits.h>
72 -
73 -+//This includes PATH_MAX
74 -+#ifdef __APPLE__
75 -+#include <sys/sysinfo.h>
76 -+#elif __linux__
77 -+#include <linux/limits.h>
78 -+#endif
79 -+
80 - #include <tox/tox.h>
81 -
82 - /* Represents line_* hints max strlen */
83
84 diff --git a/net-im/toxic/toxic-0.8.3-r3.ebuild b/net-im/toxic/toxic-0.8.3-r3.ebuild
85 deleted file mode 100644
86 index 97ed2aa0ae38..000000000000
87 --- a/net-im/toxic/toxic-0.8.3-r3.ebuild
88 +++ /dev/null
89 @@ -1,85 +0,0 @@
90 -# Copyright 1999-2021 Gentoo Authors
91 -# Distributed under the terms of the GNU General Public License v2
92 -
93 -EAPI=7
94 -
95 -PYTHON_COMPAT=( python3_{7,8,9,10} )
96 -
97 -inherit python-single-r1 xdg
98 -
99 -DESCRIPTION="A curses-based client for Tox"
100 -HOMEPAGE="https://github.com/JFreegman/toxic"
101 -SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
102 -
103 -LICENSE="GPL-3+"
104 -SLOT="0"
105 -KEYWORDS="amd64 x86"
106 -IUSE="notification python qrcode +sound +video +X"
107 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
108 -
109 -BDEPEND="dev-libs/libconfig"
110 -
111 -RDEPEND="net-libs/tox:=
112 - net-misc/curl
113 - sys-libs/ncurses:=
114 - sys-kernel/linux-headers
115 - notification? ( x11-libs/libnotify )
116 - python? ( ${PYTHON_DEPS} )
117 - qrcode? ( media-gfx/qrencode:= )
118 - sound? (
119 - media-libs/freealut
120 - media-libs/openal
121 - net-libs/tox:=[av]
122 - )
123 - video? (
124 - media-libs/libvpx:=
125 - net-libs/tox:=[av]
126 - x11-libs/libX11 )"
127 -
128 -DEPEND="${RDEPEND}"
129 -
130 -pkg_setup() {
131 - use python && python-single-r1_pkg_setup
132 -}
133 -
134 -src_prepare() {
135 - default
136 - #prevent man files from being compressed.
137 - sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
138 - #Fix incorrect include declarations for NAME_MAX and PATH_MAX.
139 - eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix include statements"
140 -}
141 -
142 -src_configure() {
143 - export USER_CFLAGS="${CFLAGS}"
144 - export USER_LDFLAGS="${LDFLAGS}"
145 - if ! use sound; then
146 - export DISABLE_AV=1
147 - export DISABLE_SOUND_NOTIFY=1
148 - fi
149 - if ! use video; then
150 - export DISABLE_VI=1
151 - fi
152 - if ! use X; then
153 - export DISABLE_X11=1
154 - fi
155 - if ! use notification; then
156 - export DISABLE_DESKTOP_NOTIFY=1
157 - fi
158 - if ! use qrcode; then
159 - export DISABLE_QRCODE=1
160 - export DISABLE_QRPNG=1
161 - fi
162 - if use python; then
163 - export ENABLE_PYTHON=1
164 - fi
165 - #set install directory to /usr.
166 - sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
167 -}
168 -
169 -src_install() {
170 - default
171 - if ! use sound; then
172 - rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
173 - fi
174 -}