[gentoo-commits] repo/gentoo:master commit in: dev-libs/cxxtools/, dev-libs/cxxtools/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/cxxtools/, dev-libs/cxxtools/files/

[Joerg Bornkessel]

commit:     7b5d0d3fa9f87551e236f3ff41cffa2f39da1e6e
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 18:49:40 2016 +0000
Commit:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Mon May 16 18:51:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b5d0d3f

dev-libs/cxxtools: clean up old, depend on wrt bug 498546

Package-Manager: portage-2.3.0_rc1

 dev-libs/cxxtools/Manifest                         |  1 -
 dev-libs/cxxtools/cxxtools-1.4.8.ebuild            | 32 ----------------------
 dev-libs/cxxtools/files/cxxtools-1.4.8-gcc44.patch | 12 --------
 3 files changed, 45 deletions(-)

diff --git a/dev-libs/cxxtools/Manifest b/dev-libs/cxxtools/Manifest
index cc63292..5a12e49 100644
--- a/dev-libs/cxxtools/Manifest
+++ b/dev-libs/cxxtools/Manifest
@@ -1,2 +1 @@
-DIST cxxtools-1.4.8.tar.gz 451807 SHA256 95476dce9f47c87b46806b072d2327d221e50b1502ad44413074d70fc084bde1 SHA512 40a61fc3e4fe283313894a6a0082b6ecb9e8416acd5a3c6f52aa9bccff232d31c3f95b8b4792d4f6bd33702762f0f4f638be51cb5516dfa518c3aa04de631924 WHIRLPOOL 290e579505237a77a0a9a13f8a9286118d5f4afaadbbf7fee162cd22ab1314a6561586c67b12c50780cb16b3cfd39da5f7c9ab5785695b4dc4e7dc3fc7f74331
 DIST cxxtools-2.2.1.tar.gz 821324 SHA256 8cebb6d6cda7c93cc4f7c0d552a68d50dd5530b699cf87916bb3b708fdc4e342 SHA512 b6dc3f63c39fbbc35af973eea668a44d30673140c72bfa7efbdc21a71816be2983e85312b9213264d4f5162c3e420eedb41974bacb7fe8176f2a069b6f8f6f7b WHIRLPOOL fe9a23d2bf585065a46d71081af921267853043a575df7e072812843bbe9b6cb9ad790086c9d7bb2916fb9af7e229874a476b5a0b499e9c5b0dee06afe1bf48f

diff --git a/dev-libs/cxxtools/cxxtools-1.4.8.ebuild b/dev-libs/cxxtools/cxxtools-1.4.8.ebuild
deleted file mode 100644
index a3fb2b3..0000000
--- a/dev-libs/cxxtools/cxxtools-1.4.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Collection of general purpose C++-classes"
-HOMEPAGE="http://www.tntnet.org/cxxtools.html"
-SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND="virtual/libiconv"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog
-}

diff --git a/dev-libs/cxxtools/files/cxxtools-1.4.8-gcc44.patch b/dev-libs/cxxtools/files/cxxtools-1.4.8-gcc44.patch
deleted file mode 100644
index 6ab10f3..0000000
--- a/dev-libs/cxxtools/files/cxxtools-1.4.8-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur cxxtools-1.4.8.orig/src/hdstream.cpp cxxtools-1.4.8/src/hdstream.cpp
---- cxxtools-1.4.8.orig/src/hdstream.cpp	2008-05-04 18:55:37.000000000 +0300
-+++ cxxtools-1.4.8/src/hdstream.cpp	2009-08-07 19:27:40.000000000 +0300
-@@ -20,6 +20,8 @@
-  */
- 
- #include "cxxtools/hdstream.h"
-+
-+#include <cstdio>
- #include <iomanip>
- #include <cctype>
- 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/cxxtools/, dev-libs/cxxtools/files/

[Sam James]

commit:     7966df0d4206f1f85a392e7325048ebe41be40e7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 12:11:15 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 12:11:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7966df0d

dev-libs/cxxtools: fix build with GCC 12; fix build with lld

Closes: https://bugs.gentoo.org/851837
Closes: https://bugs.gentoo.org/829662
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/cxxtools/cxxtools-3.0-r2.ebuild           | 45 ++++++++++++++++++++++
 .../cxxtools/files/cxxtools-3.0-gcc12-time.patch   | 11 ++++++
 .../files/cxxtools-3.0-lld-linking-openssl.patch   | 11 ++++++
 3 files changed, 67 insertions(+)

diff --git a/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild b/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild
new file mode 100644
index 000000000000..10143b5f51ad
--- /dev/null
+++ b/dev-libs/cxxtools/cxxtools-3.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Collection of general purpose C++-classes"
+HOMEPAGE="http://www.tntnet.org/cxxtools.html"
+SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+RDEPEND="virtual/libiconv"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}_gcc11.patch
+	"${FILESDIR}"/${PN}-3.0-gcc12-time.patch
+	"${FILESDIR}"/${PN}-3.0-lld-linking-openssl.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-demos \
+		--disable-unittest
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# remove static libs
+	rm -f "${ED}"/usr/$(get_libdir)/libcxxtools{,-bin,-http,-json,-unit,-xmlrpc}.la || die
+}

diff --git a/dev-libs/cxxtools/files/cxxtools-3.0-gcc12-time.patch b/dev-libs/cxxtools/files/cxxtools-3.0-gcc12-time.patch
new file mode 100644
index 000000000000..d80763dd4c1d
--- /dev/null
+++ b/dev-libs/cxxtools/files/cxxtools-3.0-gcc12-time.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/851837
+--- a/src/timer.cpp
++++ b/src/timer.cpp
+@@ -27,6 +27,7 @@
+ #include "cxxtools/clock.h"
+ #include "cxxtools/selector.h"
+ #include "cxxtools/datetime.h"
++#include <ctime>
+ #include <stdexcept>
+ 
+ namespace cxxtools

diff --git a/dev-libs/cxxtools/files/cxxtools-3.0-lld-linking-openssl.patch b/dev-libs/cxxtools/files/cxxtools-3.0-lld-linking-openssl.patch
new file mode 100644
index 000000000000..e2696fd094b0
--- /dev/null
+++ b/dev-libs/cxxtools/files/cxxtools-3.0-lld-linking-openssl.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -173,7 +173,7 @@ libcxxtools_la_LIBADD = $(LIBICONV)
+ libcxxtools_la_LDFLAGS = -version-info @sonumber@ @SHARED_LIB_FLAG@
+ 
+ if MAKE_OPENSSL
+-libcxxtools_la_LDFLAGS += -lssl
++libcxxtools_la_LIBADD += -lssl -lcrypto
+ libcxxtools_la_SOURCES += \
+ 	sslcertificateimpl.cpp
+ endif