* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ucommon/files/, dev-libs/ucommon/
@ 2018-10-14 10:18 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2018-10-14 10:18 UTC (permalink / raw
To: gentoo-commits
commit: 567075bd56a4727a440f94253e86c59f6e31bbc6
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 10:15:43 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 10:18:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=567075bd
dev-libs/ucommon: Drop old
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-libs/ucommon/Manifest | 3 -
.../ucommon-6.1.10-disable_rtf_gen_doxy.patch | 11 ---
.../files/ucommon-6.1.10-gcrypt_autotools.patch | 55 --------------
dev-libs/ucommon/ucommon-6.1.10.ebuild | 80 ---------------------
dev-libs/ucommon/ucommon-6.3.1.ebuild | 83 ----------------------
dev-libs/ucommon/ucommon-6.5.2.ebuild | 83 ----------------------
6 files changed, 315 deletions(-)
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index a06751e6794..929a0e34f76 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,6 +1,3 @@
DIST ucommon-6.0.3.tar.gz 806841 BLAKE2B 08e384f535529dbd27271861c473e18624d81029f7fecc08057b646f9c22d9bda956da2655114ec693a17f20764e4635701d1a932eeff2cdc8e82ad0fefd6496 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762
-DIST ucommon-6.1.10.tar.gz 833384 BLAKE2B 790d47b529550ab02651ed41954d1f6c171154d9ced01eee61d9789495e6d5b66599d3f12925f2cde1c432deb3414931a359d237572904f6ab1e17793b3bce9e SHA512 6d6e716dcb71d6a4e49307baa0e9e62b4b50f3dbe8301eb93e3b562d94eb9ccee73a733928059a5ed97deba55c00308af0326a32cec6a73dbf7884c322177050
-DIST ucommon-6.3.1.tar.gz 830661 BLAKE2B be97174c44ad79ed3e526f263da085dbc112c8f5f0b4f8415a5d30ff7f919fea65e1468aeaaf301940ce060952842fc0e59184539c63ba965c01a0cb598dce30 SHA512 6f4832ac53aaf1456f2d913730b66588a89a3c1292fb79f3f56da466a2542af9c836579c0a3c4daf3f896a0c3e35f861b71514f960052adcb4e3abb872b781ec
-DIST ucommon-6.5.2.tar.gz 847128 BLAKE2B a4bd6975ad0a83a109a85b5654fbf176957df0bad8edf1a519438c49af00a5523258e97a231021f9a3a3492746b6b6b88aa79600e58bf47b60ac6466b2f4fa12 SHA512 dc6dc048bad52d117edd1936ad31fd9fc6dba418fea3f7fd1578a96909c1eb53d2a42c4773a168db38ff24fc73b467ab30ec9b5ad5132ae473c36cea0e77b341
DIST ucommon-6.5.7.tar.gz 855822 BLAKE2B 56b5eb5f8372f983e0f348e5fc494c15bea57dc711e88a9a9f4ceeb8abf03680a82948ea080053a9d4c846172b64443a3947b3774b50c6d0a60c1f2ced63e69d SHA512 9927c9726252cdf050f217fa5993d34dcf9f76fab8399ee3a4c91cf087d9409947ed486a21e8448cb57ea95b52826682120f99d39287983c306434f9121b4d24
DIST ucommon-7.0.0.tar.gz 837905 BLAKE2B ddc82d5d1a88d66f353d9e69eacd7cfaaa0204acb8b9c4152559a009d287f2ffdb7feedc6fc0303c93a39d607498dd15bf83798d088857582f79be435d010ca7 SHA512 d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b
diff --git a/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch
deleted file mode 100644
index e9b581f7eb9..00000000000
--- a/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Doxyfile
-+++ b/Doxyfile
-@@ -40,7 +40,7 @@
- GENERATE_HTMLHELP = YES
- GENERATE_TREEVIEW = NO
- TREEVIEW_WIDTH = 256
--GENERATE_LATEX = YES
-+GENERATE_LATEX = NO
- COMPACT_LATEX = YES
- PDF_HYPERLINKS = YES
- USE_PDFLATEX = NO
diff --git a/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch
deleted file mode 100644
index 916df95576c..00000000000
--- a/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,6 +8,8 @@
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-+ACLOCAL_AMFLAGS = -I m4
-+
- EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \
- *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \
- CMakeLists.txt ucommon-config.cmake ucommon.pc.cmake cmake-abi.sh \
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,6 +40,9 @@
-
- CHECKFLAGS="$CHECKFLAGS"
-
-+m4_include([m4/libgcrypt.m4])
-+
-+
- case "$with_crypto" in
- ssl|openssl)
- ssl="openssl"
-@@ -698,6 +701,8 @@
- gnutls|gnu)
- if test ! -z "$GNUTLS_LIBS" ; then
- SECURE_LIBS="$GNUTLS_LIBS"
-+ AM_PATH_LIBGCRYPT
-+ SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS"
- SECURE="gnutls"
- fi
- ;;
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -9,9 +9,9 @@
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- MAINTAINERCLEANFILES = Makefile.in Makefile
--AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@
-+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@
- AM_CPPFLAGS = -I$(top_srcdir)/inc
--LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@
-+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ @LIBGCRYPT_LIBS@
- EXTRA_DIST = *.1
-
- man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 \
-@@ -30,7 +30,7 @@
- scrub_files_LDFLAGS = @SECURE_LOCAL@
-
- mdsum_SOURCES = mdsum.cpp
--mdsum_LDFLAGS = @SECURE_LOCAL@
-+mdsum_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@
-
- zerofill_SOURCES = zerofill.cpp
- zerofill_LDFLAGS = @SECURE_LOCAL@
diff --git a/dev-libs/ucommon/ucommon-6.1.10.ebuild b/dev-libs/ucommon/ucommon-6.1.10.ebuild
deleted file mode 100644
index e032afde5db..00000000000
--- a/dev-libs/ucommon/ucommon-6.1.10.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
-
-RDEPEND="
- ssl? (
- gnutls? (
- net-libs/gnutls:0=
- dev-libs/libgcrypt:0=
- )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )"
-
-DEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )
- ${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=(
- "${FILESDIR}"/${PN}-6.1.10-disable_rtf_gen_doxy.patch
- "${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
- "${FILESDIR}"/${PN}-6.1.10-gcrypt_autotools.patch
-)
-
-# Needed for doxygen, bug #526726
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
- # Aclocal 1.13 deprecated error BGO #467674
- sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myconf=""
- if use ssl; then
- myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
- else
- myconf+=" --with-sslstack=nossl ";
- fi
-
- local myeconfargs=(
- $(use_enable socks)
- $(use_enable cxx stdcpp)
- ${myconf}
- --enable-atomics
- --with-pkg-config
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
- use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
- autotools-utils_src_install
- if use doc; then
- dohtml doc/html/*
- fi
-}
diff --git a/dev-libs/ucommon/ucommon-6.3.1.ebuild b/dev-libs/ucommon/ucommon-6.3.1.ebuild
deleted file mode 100644
index 8dd276b800f..00000000000
--- a/dev-libs/ucommon/ucommon-6.3.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
-
-RDEPEND="
- ssl? (
- gnutls? (
- net-libs/gnutls:0=
- dev-libs/libgcrypt:0=
- )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )"
-
-DEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )
- ${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=(
- "${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
- "${FILESDIR}"/${PN}-6.3.1-gcrypt_autotools.patch
-)
-
-# Needed for doxygen, bug #526726
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
- # Aclocal 1.13 deprecated error BGO #467674
- sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
-
- # don't install latex and rtf documents
- sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
- -i Doxyfile.in || die
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myconf=""
- if use ssl; then
- myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
- else
- myconf+=" --with-sslstack=nossl ";
- fi
-
- local myeconfargs=(
- $(use_enable socks)
- $(use_enable cxx stdcpp)
- ${myconf}
- --enable-atomics
- --with-pkg-config
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
- use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
- autotools-utils_src_install
- if use doc; then
- dohtml doc/html/*
- fi
-}
diff --git a/dev-libs/ucommon/ucommon-6.5.2.ebuild b/dev-libs/ucommon/ucommon-6.5.2.ebuild
deleted file mode 100644
index e8e90402975..00000000000
--- a/dev-libs/ucommon/ucommon-6.5.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
-
-RDEPEND="
- ssl? (
- gnutls? (
- net-libs/gnutls:0=
- dev-libs/libgcrypt:0=
- )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )"
-
-DEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )
- ${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=(
- "${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch"
- "${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch"
-)
-
-# Needed for doxygen, bug #526726
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
- # Aclocal 1.13 deprecated error BGO #467674
- sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
-
- # don't install latex and rtf documents
- sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
- -i Doxyfile.in || die
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myconf=""
- if use ssl; then
- myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
- else
- myconf+=" --with-sslstack=nossl ";
- fi
-
- local myeconfargs=(
- $(use_enable socks)
- $(use_enable cxx stdcpp)
- ${myconf}
- --enable-atomics
- --with-pkg-config
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
- use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
- autotools-utils_src_install
- if use doc; then
- dohtml doc/html/*
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ucommon/files/, dev-libs/ucommon/
@ 2020-12-28 12:42 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-12-28 12:42 UTC (permalink / raw
To: gentoo-commits
commit: b355dd860e37380ee48cc9a4ca6ea080130a1015
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 12:42:08 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 12:42:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b355dd86
dev-libs/ucommon: Drop old, EAPI5--
Closes: https://bugs.gentoo.org/638252
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/ucommon/Manifest | 2 -
.../files/ucommon-6.0.3-disable_rtf_gen_doxy.patch | 18 -----
.../files/ucommon-6.0.3-gcrypt_autotools.patch | 59 ---------------
.../files/ucommon-6.3.1-gcrypt_autotools.patch | 48 -------------
dev-libs/ucommon/metadata.xml | 3 -
dev-libs/ucommon/ucommon-6.0.3.ebuild | 76 --------------------
dev-libs/ucommon/ucommon-6.5.7.ebuild | 83 ----------------------
7 files changed, 289 deletions(-)
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index 929a0e34f76..57e037574ae 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,3 +1 @@
-DIST ucommon-6.0.3.tar.gz 806841 BLAKE2B 08e384f535529dbd27271861c473e18624d81029f7fecc08057b646f9c22d9bda956da2655114ec693a17f20764e4635701d1a932eeff2cdc8e82ad0fefd6496 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762
-DIST ucommon-6.5.7.tar.gz 855822 BLAKE2B 56b5eb5f8372f983e0f348e5fc494c15bea57dc711e88a9a9f4ceeb8abf03680a82948ea080053a9d4c846172b64443a3947b3774b50c6d0a60c1f2ced63e69d SHA512 9927c9726252cdf050f217fa5993d34dcf9f76fab8399ee3a4c91cf087d9409947ed486a21e8448cb57ea95b52826682120f99d39287983c306434f9121b4d24
DIST ucommon-7.0.0.tar.gz 837905 BLAKE2B ddc82d5d1a88d66f353d9e69eacd7cfaaa0204acb8b9c4152559a009d287f2ffdb7feedc6fc0303c93a39d607498dd15bf83798d088857582f79be435d010ca7 SHA512 d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b
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
deleted file mode 100644
index a872f54ffe2..00000000000
--- a/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Doxyfile
-+++ b/Doxyfile
-@@ -37,13 +37,13 @@
- GENERATE_HTMLHELP = YES
- GENERATE_TREEVIEW = YES
- TREEVIEW_WIDTH = 256
--GENERATE_LATEX = YES
-+GENERATE_LATEX = NO
- COMPACT_LATEX = YES
- PDF_HYPERLINKS = YES
- USE_PDFLATEX = NO
- LATEX_BATCHMODE = YES
- LATEX_HIDE_INDICES = NO
--GENERATE_RTF = YES
-+GENERATE_RTF = NO
- COMPACT_RTF = YES
- RTF_HYPERLINKS = NO
- GENERATE_MAN = NO
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
deleted file mode 100644
index ff69e836a9d..00000000000
--- a/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,6 +8,8 @@
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-+ACLOCAL_AMFLAGS = -I m4
-+
- AUTOMAKE_OPTIONS = no-dependencies dist-zip
- EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \
- *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,8 +37,12 @@
- UCOMMON_LIBS=""
- OPENSSL_LINK=""
-
-+AM_SILENT_RULES([yes])
-+
- CHECKFLAGS="$CHECKFLAGS"
-
-+m4_include([m4/libgcrypt.m4])
-+
- case "$with_crypto" in
- ssl|openssl)
- ssl="openssl"
-@@ -664,7 +668,8 @@
- ;;
- gnutls|gnu)
- if test ! -z "$GNUTLS_LIBS" ; then
-- SECURE_LIBS="$GNUTLS_LIBS"
-+ AM_PATH_LIBGCRYPT
-+ SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS"
- SECURE="gnutls"
- fi
- ;;
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -9,9 +9,9 @@
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- MAINTAINERCLEANFILES = Makefile.in Makefile
--AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@
-+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@
- INCLUDES = -I$(top_srcdir)/inc
--LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@
-+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ @LIBGCRYPT_LIBS@
- EXTRA_DIST = *.1
-
- man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 pdetach.1
-@@ -27,7 +27,7 @@
- scrub_files_LDFLAGS = @SECURE_LOCAL@
-
- mdsum_SOURCES = mdsum.cpp
--mdsum_LDFLAGS = @SECURE_LOCAL@
-+mdsum_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@
-
- zerofill_SOURCES = zerofill.cpp
- zerofill_LDFLAGS = @SECURE_LOCAL@
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
deleted file mode 100644
index 7221890a9b7..00000000000
--- a/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,8 +38,12 @@
- OPENSSL_LINK=""
- MODULE_FLAGS="-module -shared -avoid-version"
-
-+AM_SILENT_RULES([yes])
-+
- CHECKFLAGS="$CHECKFLAGS"
-
-+m4_include([m4/libgcrypt.m4])
-+
- case "$with_crypto" in
- ssl|openssl)
- ssl="openssl"
-@@ -598,7 +602,8 @@
- ;;
- gnutls|gnu)
- if test ! -z "$GNUTLS_LIBS" ; then
-- SECURE_LIBS="$GNUTLS_LIBS"
-+ AM_PATH_LIBGCRYPT
-+ SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS"
- SECURE="gnutls"
- fi
- ;;
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -10,9 +10,9 @@
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- MAINTAINERCLEANFILES = Makefile.in Makefile
--AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@
-+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@
- AM_CPPFLAGS = -I$(top_srcdir)/inc
--LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@
-+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @LIBGCRYPT_LIBS@
- EXTRA_DIST = *.1 CMakeLists.txt
-
- man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 \
-@@ -21,7 +21,7 @@
-
- noinst_PROGRAMS = demoSSL
- demoSSL_SOURCES = ssl.cpp
--demoSSL_LDFLAGS = @SECURE_LOCAL@
-+demoSSL_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@
-
- args_SOURCES = args.cpp
-
diff --git a/dev-libs/ucommon/metadata.xml b/dev-libs/ucommon/metadata.xml
index 72a1c4cf8f6..c5adddd4b3e 100644
--- a/dev-libs/ucommon/metadata.xml
+++ b/dev-libs/ucommon/metadata.xml
@@ -5,7 +5,4 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
-<use>
- <flag name="socks">Build with socks proxy support</flag>
-</use>
</pkgmetadata>
diff --git a/dev-libs/ucommon/ucommon-6.0.3.ebuild b/dev-libs/ucommon/ucommon-6.0.3.ebuild
deleted file mode 100644
index 9c0884fe1ca..00000000000
--- a/dev-libs/ucommon/ucommon-6.0.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug ssl gnutls"
-
-RDEPEND="ssl? (
- !gnutls? ( dev-libs/openssl:0= )
- gnutls? (
- net-libs/gnutls
- dev-libs/libgcrypt:0
- )
- )"
-
-DEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )
- ${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=(
- "${FILESDIR}"/${PN}-6.0.3-disable_rtf_gen_doxy.patch
- "${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
- "${FILESDIR}"/${PN}-6.0.3-gcrypt_autotools.patch
-)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-
- # Aclocal 1.13 deprecated error #467674
- sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myconf=""
- if use ssl; then
- myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
- else
- myconf+=" --with-sslstack=nossl ";
- fi
-
- local myeconfargs=(
- $(use_enable socks)
- $(use_enable cxx stdcpp)
- ${myconf}
- --enable-atomics
- --with-pkg-config
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
- use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
- autotools-utils_src_install
- if use doc; then
- dohtml doc/html/*
- fi
-}
diff --git a/dev-libs/ucommon/ucommon-6.5.7.ebuild b/dev-libs/ucommon/ucommon-6.5.7.ebuild
deleted file mode 100644
index e8e90402975..00000000000
--- a/dev-libs/ucommon/ucommon-6.5.7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
-
-RDEPEND="
- ssl? (
- gnutls? (
- net-libs/gnutls:0=
- dev-libs/libgcrypt:0=
- )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )"
-
-DEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )
- ${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=(
- "${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch"
- "${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch"
-)
-
-# Needed for doxygen, bug #526726
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
- # Aclocal 1.13 deprecated error BGO #467674
- sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
-
- # don't install latex and rtf documents
- sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
- -i Doxyfile.in || die
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myconf=""
- if use ssl; then
- myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
- else
- myconf+=" --with-sslstack=nossl ";
- fi
-
- local myeconfargs=(
- $(use_enable socks)
- $(use_enable cxx stdcpp)
- ${myconf}
- --enable-atomics
- --with-pkg-config
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
- use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
- autotools-utils_src_install
- if use doc; then
- dohtml doc/html/*
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-28 12:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-14 10:18 [gentoo-commits] repo/gentoo:master commit in: dev-libs/ucommon/files/, dev-libs/ucommon/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-12-28 12:42 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox