| 1 |
commit: b355dd860e37380ee48cc9a4ca6ea080130a1015 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 28 12:42:08 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 28 12:42:22 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b355dd86 |
| 7 |
|
| 8 |
dev-libs/ucommon: Drop old, EAPI5-- |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/638252 |
| 11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-libs/ucommon/Manifest | 2 - |
| 15 |
.../files/ucommon-6.0.3-disable_rtf_gen_doxy.patch | 18 ----- |
| 16 |
.../files/ucommon-6.0.3-gcrypt_autotools.patch | 59 --------------- |
| 17 |
.../files/ucommon-6.3.1-gcrypt_autotools.patch | 48 ------------- |
| 18 |
dev-libs/ucommon/metadata.xml | 3 - |
| 19 |
dev-libs/ucommon/ucommon-6.0.3.ebuild | 76 -------------------- |
| 20 |
dev-libs/ucommon/ucommon-6.5.7.ebuild | 83 ---------------------- |
| 21 |
7 files changed, 289 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest |
| 24 |
index 929a0e34f76..57e037574ae 100644 |
| 25 |
--- a/dev-libs/ucommon/Manifest |
| 26 |
+++ b/dev-libs/ucommon/Manifest |
| 27 |
@@ -1,3 +1 @@ |
| 28 |
-DIST ucommon-6.0.3.tar.gz 806841 BLAKE2B 08e384f535529dbd27271861c473e18624d81029f7fecc08057b646f9c22d9bda956da2655114ec693a17f20764e4635701d1a932eeff2cdc8e82ad0fefd6496 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762 |
| 29 |
-DIST ucommon-6.5.7.tar.gz 855822 BLAKE2B 56b5eb5f8372f983e0f348e5fc494c15bea57dc711e88a9a9f4ceeb8abf03680a82948ea080053a9d4c846172b64443a3947b3774b50c6d0a60c1f2ced63e69d SHA512 9927c9726252cdf050f217fa5993d34dcf9f76fab8399ee3a4c91cf087d9409947ed486a21e8448cb57ea95b52826682120f99d39287983c306434f9121b4d24 |
| 30 |
DIST ucommon-7.0.0.tar.gz 837905 BLAKE2B ddc82d5d1a88d66f353d9e69eacd7cfaaa0204acb8b9c4152559a009d287f2ffdb7feedc6fc0303c93a39d607498dd15bf83798d088857582f79be435d010ca7 SHA512 d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b |
| 31 |
|
| 32 |
diff --git a/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch |
| 33 |
deleted file mode 100644 |
| 34 |
index a872f54ffe2..00000000000 |
| 35 |
--- a/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,18 +0,0 @@ |
| 38 |
---- a/Doxyfile |
| 39 |
-+++ b/Doxyfile |
| 40 |
-@@ -37,13 +37,13 @@ |
| 41 |
- GENERATE_HTMLHELP = YES |
| 42 |
- GENERATE_TREEVIEW = YES |
| 43 |
- TREEVIEW_WIDTH = 256 |
| 44 |
--GENERATE_LATEX = YES |
| 45 |
-+GENERATE_LATEX = NO |
| 46 |
- COMPACT_LATEX = YES |
| 47 |
- PDF_HYPERLINKS = YES |
| 48 |
- USE_PDFLATEX = NO |
| 49 |
- LATEX_BATCHMODE = YES |
| 50 |
- LATEX_HIDE_INDICES = NO |
| 51 |
--GENERATE_RTF = YES |
| 52 |
-+GENERATE_RTF = NO |
| 53 |
- COMPACT_RTF = YES |
| 54 |
- RTF_HYPERLINKS = NO |
| 55 |
- GENERATE_MAN = NO |
| 56 |
|
| 57 |
diff --git a/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch |
| 58 |
deleted file mode 100644 |
| 59 |
index ff69e836a9d..00000000000 |
| 60 |
--- a/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch |
| 61 |
+++ /dev/null |
| 62 |
@@ -1,59 +0,0 @@ |
| 63 |
---- a/Makefile.am |
| 64 |
-+++ b/Makefile.am |
| 65 |
-@@ -8,6 +8,8 @@ |
| 66 |
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the |
| 67 |
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 68 |
- |
| 69 |
-+ACLOCAL_AMFLAGS = -I m4 |
| 70 |
-+ |
| 71 |
- AUTOMAKE_OPTIONS = no-dependencies dist-zip |
| 72 |
- EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \ |
| 73 |
- *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \ |
| 74 |
---- a/configure.ac |
| 75 |
-+++ b/configure.ac |
| 76 |
-@@ -37,8 +37,12 @@ |
| 77 |
- UCOMMON_LIBS="" |
| 78 |
- OPENSSL_LINK="" |
| 79 |
- |
| 80 |
-+AM_SILENT_RULES([yes]) |
| 81 |
-+ |
| 82 |
- CHECKFLAGS="$CHECKFLAGS" |
| 83 |
- |
| 84 |
-+m4_include([m4/libgcrypt.m4]) |
| 85 |
-+ |
| 86 |
- case "$with_crypto" in |
| 87 |
- ssl|openssl) |
| 88 |
- ssl="openssl" |
| 89 |
-@@ -664,7 +668,8 @@ |
| 90 |
- ;; |
| 91 |
- gnutls|gnu) |
| 92 |
- if test ! -z "$GNUTLS_LIBS" ; then |
| 93 |
-- SECURE_LIBS="$GNUTLS_LIBS" |
| 94 |
-+ AM_PATH_LIBGCRYPT |
| 95 |
-+ SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS" |
| 96 |
- SECURE="gnutls" |
| 97 |
- fi |
| 98 |
- ;; |
| 99 |
---- a/utils/Makefile.am |
| 100 |
-+++ b/utils/Makefile.am |
| 101 |
-@@ -9,9 +9,9 @@ |
| 102 |
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 103 |
- |
| 104 |
- MAINTAINERCLEANFILES = Makefile.in Makefile |
| 105 |
--AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ |
| 106 |
-+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@ |
| 107 |
- INCLUDES = -I$(top_srcdir)/inc |
| 108 |
--LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ |
| 109 |
-+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ @LIBGCRYPT_LIBS@ |
| 110 |
- EXTRA_DIST = *.1 |
| 111 |
- |
| 112 |
- man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 pdetach.1 |
| 113 |
-@@ -27,7 +27,7 @@ |
| 114 |
- scrub_files_LDFLAGS = @SECURE_LOCAL@ |
| 115 |
- |
| 116 |
- mdsum_SOURCES = mdsum.cpp |
| 117 |
--mdsum_LDFLAGS = @SECURE_LOCAL@ |
| 118 |
-+mdsum_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@ |
| 119 |
- |
| 120 |
- zerofill_SOURCES = zerofill.cpp |
| 121 |
- zerofill_LDFLAGS = @SECURE_LOCAL@ |
| 122 |
|
| 123 |
diff --git a/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch |
| 124 |
deleted file mode 100644 |
| 125 |
index 7221890a9b7..00000000000 |
| 126 |
--- a/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch |
| 127 |
+++ /dev/null |
| 128 |
@@ -1,48 +0,0 @@ |
| 129 |
---- a/configure.ac |
| 130 |
-+++ b/configure.ac |
| 131 |
-@@ -38,8 +38,12 @@ |
| 132 |
- OPENSSL_LINK="" |
| 133 |
- MODULE_FLAGS="-module -shared -avoid-version" |
| 134 |
- |
| 135 |
-+AM_SILENT_RULES([yes]) |
| 136 |
-+ |
| 137 |
- CHECKFLAGS="$CHECKFLAGS" |
| 138 |
- |
| 139 |
-+m4_include([m4/libgcrypt.m4]) |
| 140 |
-+ |
| 141 |
- case "$with_crypto" in |
| 142 |
- ssl|openssl) |
| 143 |
- ssl="openssl" |
| 144 |
-@@ -598,7 +602,8 @@ |
| 145 |
- ;; |
| 146 |
- gnutls|gnu) |
| 147 |
- if test ! -z "$GNUTLS_LIBS" ; then |
| 148 |
-- SECURE_LIBS="$GNUTLS_LIBS" |
| 149 |
-+ AM_PATH_LIBGCRYPT |
| 150 |
-+ SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS" |
| 151 |
- SECURE="gnutls" |
| 152 |
- fi |
| 153 |
- ;; |
| 154 |
---- a/utils/Makefile.am |
| 155 |
-+++ b/utils/Makefile.am |
| 156 |
-@@ -10,9 +10,9 @@ |
| 157 |
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| 158 |
- |
| 159 |
- MAINTAINERCLEANFILES = Makefile.in Makefile |
| 160 |
--AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ |
| 161 |
-+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@ |
| 162 |
- AM_CPPFLAGS = -I$(top_srcdir)/inc |
| 163 |
--LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ |
| 164 |
-+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @LIBGCRYPT_LIBS@ |
| 165 |
- EXTRA_DIST = *.1 CMakeLists.txt |
| 166 |
- |
| 167 |
- man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 \ |
| 168 |
-@@ -21,7 +21,7 @@ |
| 169 |
- |
| 170 |
- noinst_PROGRAMS = demoSSL |
| 171 |
- demoSSL_SOURCES = ssl.cpp |
| 172 |
--demoSSL_LDFLAGS = @SECURE_LOCAL@ |
| 173 |
-+demoSSL_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@ |
| 174 |
- |
| 175 |
- args_SOURCES = args.cpp |
| 176 |
- |
| 177 |
|
| 178 |
diff --git a/dev-libs/ucommon/metadata.xml b/dev-libs/ucommon/metadata.xml |
| 179 |
index 72a1c4cf8f6..c5adddd4b3e 100644 |
| 180 |
--- a/dev-libs/ucommon/metadata.xml |
| 181 |
+++ b/dev-libs/ucommon/metadata.xml |
| 182 |
@@ -5,7 +5,4 @@ |
| 183 |
<email>maksbotan@g.o</email> |
| 184 |
<name>Maxim Koltsov</name> |
| 185 |
</maintainer> |
| 186 |
-<use> |
| 187 |
- <flag name="socks">Build with socks proxy support</flag> |
| 188 |
-</use> |
| 189 |
</pkgmetadata> |
| 190 |
|
| 191 |
diff --git a/dev-libs/ucommon/ucommon-6.0.3.ebuild b/dev-libs/ucommon/ucommon-6.0.3.ebuild |
| 192 |
deleted file mode 100644 |
| 193 |
index 9c0884fe1ca..00000000000 |
| 194 |
--- a/dev-libs/ucommon/ucommon-6.0.3.ebuild |
| 195 |
+++ /dev/null |
| 196 |
@@ -1,76 +0,0 @@ |
| 197 |
-# Copyright 1999-2018 Gentoo Foundation |
| 198 |
-# Distributed under the terms of the GNU General Public License v2 |
| 199 |
- |
| 200 |
-EAPI="5" |
| 201 |
- |
| 202 |
-AUTOTOOLS_AUTORECONF=1 |
| 203 |
- |
| 204 |
-inherit autotools-utils eutils |
| 205 |
- |
| 206 |
-DESCRIPTION="Portable C++ runtime for threads and sockets" |
| 207 |
-HOMEPAGE="https://www.gnu.org/software/commoncpp" |
| 208 |
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" |
| 209 |
- |
| 210 |
-LICENSE="LGPL-3" |
| 211 |
-SLOT="0" |
| 212 |
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux" |
| 213 |
-IUSE="doc static-libs socks +cxx debug ssl gnutls" |
| 214 |
- |
| 215 |
-RDEPEND="ssl? ( |
| 216 |
- !gnutls? ( dev-libs/openssl:0= ) |
| 217 |
- gnutls? ( |
| 218 |
- net-libs/gnutls |
| 219 |
- dev-libs/libgcrypt:0 |
| 220 |
- ) |
| 221 |
- )" |
| 222 |
- |
| 223 |
-DEPEND="virtual/pkgconfig |
| 224 |
- doc? ( app-doc/doxygen ) |
| 225 |
- ${RDEPEND}" |
| 226 |
- |
| 227 |
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) |
| 228 |
-PATCHES=( |
| 229 |
- "${FILESDIR}"/${PN}-6.0.3-disable_rtf_gen_doxy.patch |
| 230 |
- "${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch |
| 231 |
- "${FILESDIR}"/${PN}-6.0.3-gcrypt_autotools.patch |
| 232 |
-) |
| 233 |
- |
| 234 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 235 |
- |
| 236 |
-src_prepare() { |
| 237 |
- |
| 238 |
- # Aclocal 1.13 deprecated error #467674 |
| 239 |
- sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die |
| 240 |
- |
| 241 |
- autotools-utils_src_prepare |
| 242 |
-} |
| 243 |
- |
| 244 |
-src_configure() { |
| 245 |
- local myconf="" |
| 246 |
- if use ssl; then |
| 247 |
- myconf+=" --with-sslstack=$(usex gnutls gnu ssl) " |
| 248 |
- else |
| 249 |
- myconf+=" --with-sslstack=nossl "; |
| 250 |
- fi |
| 251 |
- |
| 252 |
- local myeconfargs=( |
| 253 |
- $(use_enable socks) |
| 254 |
- $(use_enable cxx stdcpp) |
| 255 |
- ${myconf} |
| 256 |
- --enable-atomics |
| 257 |
- --with-pkg-config |
| 258 |
- ) |
| 259 |
- autotools-utils_src_configure |
| 260 |
-} |
| 261 |
- |
| 262 |
-src_compile() { |
| 263 |
- autotools-utils_src_compile |
| 264 |
- use doc && autotools-utils_src_compile doxy |
| 265 |
-} |
| 266 |
- |
| 267 |
-src_install() { |
| 268 |
- autotools-utils_src_install |
| 269 |
- if use doc; then |
| 270 |
- dohtml doc/html/* |
| 271 |
- fi |
| 272 |
-} |
| 273 |
|
| 274 |
diff --git a/dev-libs/ucommon/ucommon-6.5.7.ebuild b/dev-libs/ucommon/ucommon-6.5.7.ebuild |
| 275 |
deleted file mode 100644 |
| 276 |
index e8e90402975..00000000000 |
| 277 |
--- a/dev-libs/ucommon/ucommon-6.5.7.ebuild |
| 278 |
+++ /dev/null |
| 279 |
@@ -1,83 +0,0 @@ |
| 280 |
-# Copyright 1999-2018 Gentoo Foundation |
| 281 |
-# Distributed under the terms of the GNU General Public License v2 |
| 282 |
- |
| 283 |
-EAPI="5" |
| 284 |
- |
| 285 |
-AUTOTOOLS_AUTORECONF=1 |
| 286 |
- |
| 287 |
-inherit autotools-utils eutils |
| 288 |
- |
| 289 |
-DESCRIPTION="Portable C++ runtime for threads and sockets" |
| 290 |
-HOMEPAGE="https://www.gnu.org/software/commoncpp" |
| 291 |
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" |
| 292 |
- |
| 293 |
-LICENSE="LGPL-3" |
| 294 |
-SLOT="0/6" |
| 295 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" |
| 296 |
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls" |
| 297 |
- |
| 298 |
-RDEPEND=" |
| 299 |
- ssl? ( |
| 300 |
- gnutls? ( |
| 301 |
- net-libs/gnutls:0= |
| 302 |
- dev-libs/libgcrypt:0= |
| 303 |
- ) |
| 304 |
- !gnutls? ( |
| 305 |
- !libressl? ( dev-libs/openssl:0= ) |
| 306 |
- libressl? ( dev-libs/libressl:0= ) |
| 307 |
- ) |
| 308 |
- )" |
| 309 |
- |
| 310 |
-DEPEND="virtual/pkgconfig |
| 311 |
- doc? ( app-doc/doxygen ) |
| 312 |
- ${RDEPEND}" |
| 313 |
- |
| 314 |
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) |
| 315 |
-PATCHES=( |
| 316 |
- "${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch" |
| 317 |
- "${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch" |
| 318 |
-) |
| 319 |
- |
| 320 |
-# Needed for doxygen, bug #526726 |
| 321 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 322 |
- |
| 323 |
-src_prepare() { |
| 324 |
- # Aclocal 1.13 deprecated error BGO #467674 |
| 325 |
- sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die |
| 326 |
- |
| 327 |
- # don't install latex and rtf documents |
| 328 |
- sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \ |
| 329 |
- -i Doxyfile.in || die |
| 330 |
- |
| 331 |
- autotools-utils_src_prepare |
| 332 |
-} |
| 333 |
- |
| 334 |
-src_configure() { |
| 335 |
- local myconf="" |
| 336 |
- if use ssl; then |
| 337 |
- myconf+=" --with-sslstack=$(usex gnutls gnu ssl) " |
| 338 |
- else |
| 339 |
- myconf+=" --with-sslstack=nossl "; |
| 340 |
- fi |
| 341 |
- |
| 342 |
- local myeconfargs=( |
| 343 |
- $(use_enable socks) |
| 344 |
- $(use_enable cxx stdcpp) |
| 345 |
- ${myconf} |
| 346 |
- --enable-atomics |
| 347 |
- --with-pkg-config |
| 348 |
- ) |
| 349 |
- autotools-utils_src_configure |
| 350 |
-} |
| 351 |
- |
| 352 |
-src_compile() { |
| 353 |
- autotools-utils_src_compile |
| 354 |
- use doc && autotools-utils_src_compile doxy |
| 355 |
-} |
| 356 |
- |
| 357 |
-src_install() { |
| 358 |
- autotools-utils_src_install |
| 359 |
- if use doc; then |
| 360 |
- dohtml doc/html/* |
| 361 |
- fi |
| 362 |
-} |
Archives