gentoo auto-resync : 23:06:2023 - 13:24:24

3 files changed, 133 insertions, 0 deletions

diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
index 8be3b5a3f843..010cd1763c12 100644
--- a/media-sound/orpheus/Manifest
+++ b/media-sound/orpheus/Manifest
@@ -3,9 +3,11 @@ AUX 101_fix-buffer-overflow.diff 614 BLAKE2B a41edfc4a29b45adeb67923eeb5fe386e17
 AUX orpheus-1.6-bufsize.patch 590 BLAKE2B bd1748e80d5133f16d7394b7286a30047c245a81f38c30f2f3f2f897e7dc953d30e0259e5c6d20cb6cfa5a20d2ac5255b9f0d793770893332ea677ee907ee8cc SHA512 47e166074a585657bf49c7b3af33c2849dacbc737872ee6abd70891fddd7e8c63cf293e1180cd0f04077dcd6def495203103e92ca78a87564dcec56c0ea2f4e3
 AUX orpheus-1.6-constify.patch 2123 BLAKE2B 9842e55e4b0418f77e7f88f045e55eb953533f4a4cdeac3e49fd5d2f9369b3c328b0905555c8a0bc6acb9ac10f762230e17b25d0479247a9a119382eee2e7af4 SHA512 9e4ba5e66f65994462098f1b20208bb668e97acab3e95262ddf814879130bf3ff3caaee829631354784326b276ac23ff68dfa62374d43c8679c8beeebcd4d21b
 AUX orpheus-1.6-cppflags.patch 830 BLAKE2B a5a4d8ca2633fe31bf1b3917e7004578187ef8677a99cecb870e9e181276a2f9a03518989caf2816c52dd07c168cc6d2104b59b9d326786dd0d895a1a4633181 SHA512 4a8d51eb3ef9cadfa78c0d11ae264166589dc0a63f084f904bb7a698fda6aa570cfb940b3ad50b0fbff201d21df049369d92b7ed5452cff473ee2d7b60fda43f
+AUX orpheus-1.6-fix-build-w-clang-16.patch 2950 BLAKE2B de0ac3d0563171ee3e59d4af51e1d3413c63f985c9e1e4352aaede3cfb8396b4858ac1560768008346c10ac41098e18ebd44b27109f313c575764e6b6af07d07 SHA512 8b193247db1eb3c904198ebfd44a01cb87b12bc8e9e951cc0358af29eb860c63875f621fa5d4e211f164c7024ed99656bef65a6e11d81cdc775ec86eed32ec1a
 AUX orpheus-1.6-fix-buildsystem.patch 4346 BLAKE2B 30fd0a668a6903c1b6f285c096caa096efcd187c138a2d304e591f3543d13ff5112949852c1ffc23043a3f2f98fd1c397baeec1555506a70973125a03d86fdca SHA512 fa05fec6ec5280a2a0289c55eaac5ca84286731cff2ceb294e645a0b69415fee785ad203169a455019dbebe89e700314821779c1d81d13dc21d6ccac7109ba63
 AUX orpheus-1.6-gcc47.patch 275 BLAKE2B 90f817ffe97c0f32865ed2b87a9ec7a044045fe478ace3d290ce0fdd5446e01ab496e0e57d5ff86e6039397c2e797d086485f8c3f3f8ec85aa1592ef294c2c16 SHA512 d502efb94e6cc1e1cb452a5c7f4ed4f662353ef1bb953117d725f8125a4c7f43713071089ce5df2ab9d8adb3f2b62b178e8869b2cf2b52681ba9f9510aa313d7
 AUX orpheus-1.6-musl-stdint.patch 769 BLAKE2B aca09903fe3e46f504a83507877701240689b4b0e3b1210655afe9d53c2f93305a48d4da450c4b060cb7a95ab22ac65689ad96baca664c3ae07887f06c76726f SHA512 ad484b277ba2a650eadb6678cbbd47ce67abc30692fe7372baf8c52471375c6da2dd8a290618cbfc995a02d4a18e63028bcdc50269bbc2b24e1b07f0e25ab52f
 DIST orpheus-1.6.tar.gz 440553 BLAKE2B de5621aaf6962668bceebb35a95df7ab543b517cfe208346cdccab4f73f458611b65e4fef515c4f284d2fa83e8fc24aa77e8e6e1808fab489d056f10de7f7a99 SHA512 40f4ac7533449940370f29d4a14281d7f235ce711166e0e979f3e2a5ca37f792dc74b5267ee2a4f51af6c20f346c543d0d9f1fc88f47670971ad32f7c2856abb
 EBUILD orpheus-1.6-r3.ebuild 943 BLAKE2B 973e849a195ca43c0d96726127e4246735e6f34fe9224acf778cedf9f5bca2fc0256396ce6508594390138c22f28c62991440de7bf5d51ee7d1e76b52c68c637 SHA512 87e9a7633539987632f019d55a99c512aee10324c5d3f3db507b3515aab7f204acee0501fd5060f2cc4a1c3de97e10d92e069350495f6313044e18f2c597ad8b
+EBUILD orpheus-1.6-r4.ebuild 992 BLAKE2B f609c33bb60dedca23796f43000cac60fe0eb21e764bee5be2069c5015c2eb4c9c0b07d21d123e12cdc971bbb466bdc5c018d3a3fe38183191e44e0a3ec8ac45 SHA512 2ef12dc7aace8da9f4de1e85e89c0d8a4b0f0f2da8e57af7305818cd7f6f0b35c7f2232c37fcd378bab61dacfbfb4a5f18e99c020b0d92fb455682a8f2259afe
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/orpheus/files/orpheus-1.6-fix-build-w-clang-16.patch b/media-sound/orpheus/files/orpheus-1.6-fix-build-w-clang-16.patch
new file mode 100644
index 000000000000..603b6767f250
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-fix-build-w-clang-16.patch
@@ -0,0 +1,87 @@
+Bug: https://bugs.gentoo.org/897794
+Some replacements for making it possible to be built with clang-16
+Some of the functions (for eample binary_function and bind1st) are removed in C++17
+--- a/kkconsui-0.1/src/texteditor.cc
++++ b/kkconsui-0.1/src/texteditor.cc
+@@ -791,7 +791,8 @@ void texteditor::showline(int ln, int startx, int distance, int extrax) {
+     const char *p;
+ 
+     if(!(cs = (char *) curfile->lines->at(ln))) return;
+-    char cp[i = (strlen(cs)+1)*4];
++	i = (strlen(cs)+1)*4;
++    char cp[i];
+     char buf[i];
+ 
+     eolstart = i;
+--- a/kkstrtext-0.1/kkstrtext.cc
++++ b/kkstrtext-0.1/kkstrtext.cc
+@@ -167,7 +167,7 @@ string toutf8(const string &text) {
+ }
+ 
+ char *unmime(char *text) {
+-    register int s, d;
++    int s, d;
+     int htm;
+ 
+     for(s = 0, d = 0; text[s] != 0; s++) {
+@@ -185,7 +185,7 @@ char *unmime(char *text) {
+ }
+ 
+ char *mime(char *dst, const char *src) {
+-    register int s, d;
++    int s, d;
+     char c;
+ 
+     for(s = 0, d = 0; src[s]; s++) {
+--- a/src/cdtrack.cc
++++ b/src/cdtrack.cc
+@@ -45,8 +45,12 @@ int cdfd = -1, numtracks;
+ string cddbquery, cdid, cdtitle;
+ bool ejected = false;
+ 
+-struct istracknumber: public binary_function<int, const track*, bool> {
+-    public: bool operator()(int n, const track *c) const {
++struct istracknumber {
++    public:
++		using first_argument_type = int;
++		using second_argument_type = const track*;
++		using result_type = bool;
++		bool operator()(int n, const track *c) const {
+ 	const cdtrack *cdt = static_cast<const cdtrack *>(c);
+ 
+ 	if(cdt) {
+@@ -104,7 +108,7 @@ vector<string> cdtrack::getstatus() const {
+ 
+ 	r.push_back("CD: " + cdtitle + "; " + buf);
+ 
+-	it = find_if(plist.begin(), plist.end(), bind1st(istracknumber(), subc.cdsc_trk));
++	it = find_if(plist.begin(), plist.end(), bind(istracknumber(), subc.cdsc_trk, std::placeholders::_1));
+ 
+ 	if(it != plist.end()) {
+ 	    cdtrack *ct = static_cast<cdtrack *>(*it);
+@@ -332,7 +336,7 @@ bool cdtrack::loadtracks(const string &fname) {
+ 
+ 		} else if(param.substr(0, 6) == "TTITLE") {
+ 		    ntrack = strtoul(param.substr(6).c_str(), 0, 0);
+-		    it = find_if(plist.begin(), plist.end(), bind1st(istracknumber(), ntrack+1));
++		    it = find_if(plist.begin(), plist.end(), bind(istracknumber(), ntrack+1, std::placeholders::_1));
+ 
+ 		    if(it != plist.end()) {
+ 			cdtrack *ct = static_cast<cdtrack *>(*it);
+--- a/src/streamtrack.cc
++++ b/src/streamtrack.cc
+@@ -283,8 +283,12 @@ string streamtrack::makerequest(const string &url) {
+     return reply;
+ }
+ 
+-struct equals_url: public binary_function<const char *, const track*, bool> {
+-    public: bool operator()(const char *aurl, const track *c) const {
++struct equals_url {
++    public: 
++		using first_argument_type = const char*;
++		using second_argument_type = const track*;
++		using result_type = bool;
++		bool operator()(const char *aurl, const track *c) const {
+ 	const streamtrack *st = static_cast<const streamtrack *>(c);
+ 
+ 	if(st) {
diff --git a/media-sound/orpheus/orpheus-1.6-r4.ebuild b/media-sound/orpheus/orpheus-1.6-r4.ebuild
new file mode 100644
index 000000000000..493d42db27f7
--- /dev/null
+++ b/media-sound/orpheus/orpheus-1.6-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Command line MP3 player"
+HOMEPAGE="http://konst.org.ua/en/orpheus"
+SRC_URI="http://konst.org.ua/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="sys-libs/ncurses:0=
+	media-libs/libvorbis
+	media-sound/mpg123
+	media-sound/vorbis-tools[ogg123]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/1.5-amd64.patch
+	"${FILESDIR}"/101_fix-buffer-overflow.diff
+	"${FILESDIR}"/${P}-fix-buildsystem.patch
+	"${FILESDIR}"/${P}-cppflags.patch
+	"${FILESDIR}"/${P}-bufsize.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-constify.patch
+	"${FILESDIR}"/${P}-musl-stdint.patch
+	"${FILESDIR}"/${P}-fix-build-w-clang-16.patch
+)
+
+src_prepare() {
+	default
+
+	cp config.rpath kkstrtext-0.1/ || die
+
+	mv configure.{in,ac} || die
+	mv kkstrtext-0.1/configure.{in,ac} || die
+	mv kkconsui-0.1/configure.{in,ac} || die
+
+	eautoreconf
+}