* [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-libs/zthread/, dev-libs/zthread/files/
@ 2024-04-27 15:01 Arthur Zamarin
0 siblings, 0 replies; only message in thread
From: Arthur Zamarin @ 2024-04-27 15:01 UTC (permalink / raw
To: gentoo-commits
commit: 5cdcb810e27d4b7be8507a6c0f7c28ef68e65dac
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 14:56:47 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 14:56:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cdcb810
dev-libs/zthread: treeclean
Closes: https://bugs.gentoo.org/924925
Bug: https://bugs.gentoo.org/912434
Bug: https://bugs.gentoo.org/715478
Bug: https://bugs.gentoo.org/903529
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-libs/zthread/Manifest | 1 -
.../zthread/files/zthread-2.3.2-automake-r2.patch | 75 -----------------
dev-libs/zthread/files/zthread-2.3.2-clang.patch | 15 ----
.../files/zthread-2.3.2-configure-clang16.patch | 22 -----
dev-libs/zthread/files/zthread-2.3.2-gcc47.patch | 25 ------
.../zthread/files/zthread-2.3.2-m4-quote.patch | 26 ------
.../files/zthread-2.3.2-no-fpermissive-r1.diff | 94 ----------------------
dev-libs/zthread/metadata.xml | 8 --
dev-libs/zthread/zthread-2.3.2-r5.ebuild | 65 ---------------
profiles/package.mask | 6 --
10 files changed, 337 deletions(-)
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
deleted file mode 100644
index af07a5000190..000000000000
--- a/dev-libs/zthread/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ZThread-2.3.2.tar.gz 412527 BLAKE2B f8b176a35ca2df21460825f4cf9406a0e0fdd0a320eca2ffa323c47f025fa76e087bc30e3f6f2dc061cd79b0346c023f736f5fa2d1b0829eef718197c4e50e67 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b
diff --git a/dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch b/dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch
deleted file mode 100644
index bcd9e0675979..000000000000
--- a/dev-libs/zthread/files/zthread-2.3.2-automake-r2.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 577b34b74b7a73650d906f371044bfaed6e8b74c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
-Date: Tue, 19 Feb 2013 10:13:12 +0100
-Subject: [PATCH] Use standard automake rules rather than hand coding the
- install rules and append linker flags to LDFLAGS and not LDADD, otherwise
- --as-needed gets ignored (and possibly others).
-
----
- Makefile.am | 21 +++++----------------
- configure.ac | 1 -
- src/Makefile.am | 2 --
- 3 files changed, 5 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 6c092cf..2d7bddf 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -24,24 +24,13 @@ LICENSE \
- MIT.TXT \
- depcomp
-
-+bin_SCRIPTS = share/zthread-config
-
--## install the config script
--install-exec-hook:
-- $(mkinstalldirs) $(bindir)
-- $(INSTALL_PROGRAM) $(top_srcdir)/share/zthread-config $(bindir)
-+aclocaldir = $(datadir)/aclocal
-+aclocal_DATA = share/zthread.m4 share/pthread.m4
-
--## install the config script & m4 macros
--install-data-hook:
-- $(mkinstalldirs) $(datadir)/aclocal
-- $(INSTALL_DATA) $(top_srcdir)/share/zthread.m4 $(datadir)/aclocal
-- $(INSTALL_DATA) $(top_srcdir)/share/pthread.m4 $(datadir)/aclocal
-- mkdir -p $(DESTDIR)$(includedir)/zthread
-- cp -pR $(top_srcdir)/include/zthread $(DESTDIR)$(includedir)/
--
--## uninstall the config script & m4 macros
--uninstall-local:
-- -rm -rf $(datadir)/aclocal/pthread.m4
-- -rm -rf $(datadir)/aclocal/zthread.m4
-+zincludedir = $(includedir)/zthread
-+zinclude_HEADERS = include/zthread/*.h
-
- distclean-local:
- -rm -rf $(top_srcdir)/$(PACKAGE)-$(VERSION).tar.gz
-diff --git a/configure.ac b/configure.ac
-index 866041b..5d32a58 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -226,7 +226,6 @@ AC_TRY_LINK( [#include <windows.h>], [_beginthreadex((void*)0, 0, 0, (void*)0, 0
-
- dnl Configure the final compiler & linker options
- COMPILER_OPTIONS="$COMPILER_OPTIONS $CXXFLAGS"
--LINKER_OPTIONS="$LINKER_OPTIONS $LDFLAGS"
-
- dnl Configured flags for compiling ZThreads
- AC_SUBST(LINKER_OPTIONS)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 04404d6..35dc764 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -21,8 +21,6 @@ AM_CXXFLAGS = @COMPILER_OPTIONS@ @EXTRA_COMPILER_OPTIONS@
- INCLUDES = -I$(top_srcdir)/include
- SUBDIRS=.
-
--libdir=$(prefix)/lib
--
- lib_LTLIBRARIES = libZThread.la
-
- libZThread_la_LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@
---
-1.8.1.1
-
diff --git a/dev-libs/zthread/files/zthread-2.3.2-clang.patch b/dev-libs/zthread/files/zthread-2.3.2-clang.patch
deleted file mode 100644
index 3c0e07b9dc4a..000000000000
--- a/dev-libs/zthread/files/zthread-2.3.2-clang.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fix compile when using clang as $CC:
-
-Based on patch from https://bugs.launchpad.net/hugin/+bug/1213585 (rebased)
-
---- a/include/zthread/Guard.h
-+++ b/include/zthread/Guard.h
-@@ -108,7 +108,7 @@
- }
-
- template <class LockType>
-- static void createScope(LockHolder<LockType>& l, unsigned long ms) {
-+ static bool createScope(LockHolder<LockType>& l, unsigned long ms) {
-
- if(Scope1::createScope(l, ms))
- if(!Scope2::createScope(l, ms)) {
diff --git a/dev-libs/zthread/files/zthread-2.3.2-configure-clang16.patch b/dev-libs/zthread/files/zthread-2.3.2-configure-clang16.patch
deleted file mode 100644
index 998dc36c2976..000000000000
--- a/dev-libs/zthread/files/zthread-2.3.2-configure-clang16.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-pthread_yield needs GNU_SOURCE (missing in the test here), but pthread_yield
-is both deprecated and also not actually used (even conditionally!) in zthread,
-so let's just drop the test.
-
-(zthread uses sched_yield conditionally, however.)
---- a/share/pthread.m4
-+++ b/share/pthread.m4
-@@ -128,14 +128,6 @@ pthread_explicit="no"
- AC_DEFINE(HAVE_SCHED_YIELD,,[Defined if sched_yield() is available]) ],
- [ AC_MSG_RESULT(no) ])
-
-- dnl Check for pthread_yield
-- AC_MSG_CHECKING(for pthread_yield);
-- AC_TRY_LINK([#include <pthread.h>],
-- [ pthread_yield(); ],
-- [ AC_MSG_RESULT(yes)
-- AC_DEFINE(HAVE_PTHREAD_YIELD,,[Defined if pthread_yield() is available]) ],
-- [ AC_MSG_RESULT(no) ])
--
- dnl Check for pthread_key_create
- AC_MSG_CHECKING(for pthread_key_create)
- AC_TRY_LINK([#include <pthread.h>],
diff --git a/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch b/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch
deleted file mode 100644
index 57b122d22c5f..000000000000
--- a/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Make sure to use qualified lookups.
-http://bugs.debian.org/667430
-https://bugs.gentoo.org/show_bug.cgi?id=414133
-
-Author: Cyril Brulebois <kibi@debian.org>
---- a/include/zthread/Guard.h
-+++ b/include/zthread/Guard.h
-@@ -428,7 +428,7 @@
- template <class U, class V>
- Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
-
-- LockingPolicy::shareScope(*this, extract(g));
-+ LockingPolicy::shareScope(*this, this->extract(g));
-
- }
-
-@@ -458,7 +458,7 @@
- template <class U, class V>
- Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
-
-- LockingPolicy::transferScope(*this, extract(g));
-+ LockingPolicy::transferScope(*this, this->extract(g));
-
- }
-
diff --git a/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch b/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch
deleted file mode 100644
index 72163a3b12a3..000000000000
--- a/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-fix m4 warnings:
-zthread.m4:34: warning: underquoted definition of AM_PATH_ZTHREAD
-pthread.m4:39: warning: underquoted definition of AM_DETECT_PTHREAD
-
---- a/share/zthread.m4
-+++ b/share/zthread.m4
-@@ -31,7 +31,7 @@
- dnl ZTHREAD_CXXFLAGS
- dnl ZTHREAD_LIBS
- dnl
--AC_DEFUN(AM_PATH_ZTHREAD,
-+AC_DEFUN([AM_PATH_ZTHREAD],
- [
-
-
---- a/share/pthread.m4
-+++ b/share/pthread.m4
-@@ -36,7 +36,7 @@
- GNU Pth can also be used if it was configured with --enable-pthread.
- EOF
-
--AC_DEFUN(AM_DETECT_PTHREAD,
-+AC_DEFUN([AM_DETECT_PTHREAD],
- [
-
- pthread_explicit="no"
diff --git a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff
deleted file mode 100644
index b8f68f59dd2a..000000000000
--- a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/include/zthread/Guard.h
-+++ b/include/zthread/Guard.h
-@@ -491,7 +491,7 @@
-
- try {
-
-- if(!isDisabled())
-+ if(!LockHolder<LockType>::isDisabled())
- LockingPolicy::destroyScope(*this);
-
- } catch (...) { /* ignore */ }
---- a/src/MutexImpl.h
-+++ b/src/MutexImpl.h
-@@ -153,7 +153,7 @@
-
- _owner = self;
-
-- ownerAcquired(self);
-+ MutexImpl<List,Behavior>::ownerAcquired(self);
-
- }
-
-@@ -164,7 +164,7 @@
- _waiters.insert(self);
- m.acquire();
-
-- waiterArrived(self);
-+ MutexImpl<List, Behavior>::waiterArrived(self);
-
- {
-
-@@ -173,7 +173,7 @@
-
- }
-
-- waiterDeparted(self);
-+ MutexImpl<List, Behavior>::waiterDeparted(self);
-
- m.release();
-
-@@ -192,7 +192,7 @@
- assert(_owner == 0);
- _owner = self;
-
-- ownerAcquired(self);
-+ MutexImpl<List, Behavior>::ownerAcquired(self);
-
- break;
-
-@@ -236,7 +236,7 @@
-
- _owner = self;
-
-- ownerAcquired(self);
-+ MutexImpl<List, Behavior>::ownerAcquired(self);
-
- }
-
-@@ -253,7 +253,7 @@
-
- m.acquire();
-
-- waiterArrived(self);
-+ MutexImpl<List, Behavior>:: waiterArrived(self);
-
- {
-
-@@ -262,7 +262,7 @@
-
- }
-
-- waiterDeparted(self);
-+ MutexImpl<List, Behavior>::waiterDeparted(self);
-
- m.release();
-
-@@ -284,7 +284,7 @@
- assert(0 == _owner);
- _owner = self;
-
-- ownerAcquired(self);
-+ MutexImpl<List, Behavior>::ownerAcquired(self);
-
- break;
-
-@@ -326,7 +326,7 @@
-
- _owner = 0;
-
-- ownerReleased(impl);
-+ MutexImpl<List, Behavior>::ownerReleased(impl);
-
- // Try to find a waiter with a backoff & retry scheme
- for(;;) {
diff --git a/dev-libs/zthread/metadata.xml b/dev-libs/zthread/metadata.xml
deleted file mode 100644
index 7f7a727d1d59..000000000000
--- a/dev-libs/zthread/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">zthread</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-libs/zthread/zthread-2.3.2-r5.ebuild b/dev-libs/zthread/zthread-2.3.2-r5.ebuild
deleted file mode 100644
index 08b64a050964..000000000000
--- a/dev-libs/zthread/zthread-2.3.2-r5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P="ZThread-${PV}"
-
-DESCRIPTION="platform-independent multi-threading and synchronization library for C++"
-HOMEPAGE="http://zthread.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86"
-IUSE="debug doc"
-
-BDEPEND="doc? ( app-text/doxygen )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-no-fpermissive-r1.diff
- "${FILESDIR}"/${P}-m4-quote.patch
- "${FILESDIR}"/${P}-automake-r2.patch
- "${FILESDIR}"/${P}-gcc47.patch
- "${FILESDIR}"/${P}-clang.patch
- "${FILESDIR}"/${P}-configure-clang16.patch
-)
-
-src_prepare() {
- default
-
- rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die
-
- # bug #467778
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
- AT_M4DIR="share" eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable kernel_linux atomic-linux)
-}
-
-src_compile() {
- default
-
- if use doc; then
- doxygen doc/zthread.doxygen || die
- sed -i -e 's|href="html/|href="|' doc/documentation.html || die
- cp doc/documentation.html doc/html/index.html || die
- cp doc/{zthread.css,bugs.js} doc/html/ || die
- fi
-}
-
-src_install() {
- default
-
- use doc && dodoc -r doc/html
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index c91a60cb0bec..efac407b9ffc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -382,12 +382,6 @@ sys-auth/pam_ssh
# Removal on 2024-04-25. Bug #895222.
app-misc/tek
-# Michał Górny <mgorny@gentoo.org> (2024-03-26)
-# Bad C++ code. Unmaintained. Carries a number of patches already.
-# No reverse dependencies.
-# Removal on 2024-04-25. Bug #924925.
-dev-libs/zthread
-
# Rahil Bhimjiani <me@rahil.rocks> (2024-03-17)
# buildah-1.34.0 isn't getting security fixes from upstream
# https://github.com/containers/buildah/issues/5320
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2024-04-27 15:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-27 15:01 [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-libs/zthread/, dev-libs/zthread/files/ Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox