[gentoo-commits] repo/gentoo:master commit in: media-sound/pms/files/, media-sound/pms/

[gentoo-commits] repo/gentoo:master commit in: media-sound/pms/files/, media-sound/pms/

[Marek Szuba]

commit:     05ccefafff83dc9190ac48572116eeab854f3781
Author:     Mykyta Holubakha <hilobakho <AT> gmail <DOT> com>
AuthorDate: Thu Sep  8 22:00:10 2016 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 08:45:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ccefaf

media-sound/pms: live ebuild overhaul

fix ncurses slot dep

specify correct license

fix automagic dependency on autodoc

add missing depends (dev-util/intltool and dev-util/gettext)

add missing rdepend on virtual/libintl

specify gcc 4.9 as the minimal gcc version

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../pms/files/pms-9999-fix-automagic-dep.patch     | 34 ++++++++++++++++++++++
 media-sound/pms/pms-9999.ebuild                    | 28 +++++++++++++-----
 2 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/media-sound/pms/files/pms-9999-fix-automagic-dep.patch b/media-sound/pms/files/pms-9999-fix-automagic-dep.patch
new file mode 100644
index 00000000..afb71d1
--- /dev/null
+++ b/media-sound/pms/files/pms-9999-fix-automagic-dep.patch
@@ -0,0 +1,34 @@
+From 3771a139059cf248cc07cf8a735c0cd95ae3c6af Mon Sep 17 00:00:00 2001
+From: Mykyta Holubakha <hilobakho@gmail.com>
+Date: Fri, 9 Sep 2016 00:56:22 +0300
+Subject: [PATCH] Fix automagic pandoc dependency
+
+---
+ configure.ac | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 45e6d1a..aea9285 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,9 +25,14 @@ PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.0],, [AC_MSG_ERROR([glib 2.0 or newer i
+ PKG_CHECK_MODULES([libmpdclient], [libmpdclient >= 2.5],, [AC_MSG_ERROR([libmpdclient 2.5 or newer is required])])
+ 
+ # Check for Pandoc
+-AC_PATH_PROG(PANDOC,pandoc,no)
+-if [[ "x$PANDOC" = xno ]]; then
+-    AC_MSG_WARN([The manual page will not be built.])
++AC_ARG_WITH([doc], AS_HELP_STRING([--with-doc],[Build the manpage (default: disabled)]))
++if [test "x$with_doc" = "xyes"]; then
++	AC_PATH_PROG(PANDOC,pandoc,no)
++	if [[ "x$PANDOC" = xno ]]; then
++	    AC_MSG_WARN([The manual page will not be built.])
++	fi
++else
++	PANDOC="no"
+ fi
+ AM_CONDITIONAL([PANDOC], [test "x$PANDOC" != xno])
+ 
+-- 
+2.10.0
+

diff --git a/media-sound/pms/pms-9999.ebuild b/media-sound/pms/pms-9999.ebuild
index af181ef..b7aed94 100644
--- a/media-sound/pms/pms-9999.ebuild
+++ b/media-sound/pms/pms-9999.ebuild
@@ -4,30 +4,43 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic git-r3
+inherit autotools flag-o-matic git-r3 toolchain-funcs versionator
 
 DESCRIPTION="Practical Music Search: an open source ncurses client for mpd, written in C++"
 HOMEPAGE="https://ambientsound.github.io/pms"
 EGIT_REPO_URI="https://github.com/ambientsound/pms.git"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS=""
-IUSE="regex"
+IUSE="regex doc"
 
 RDEPEND="
-	sys-libs/ncurses:=[unicode]
+	sys-libs/ncurses:0=[unicode]
 	dev-libs/glib:2
 	media-libs/libmpdclient
+	virtual/libintl
 "
 DEPEND="
 	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext
+	doc? ( app-text/pandoc )
 	${RDEPEND}
 "
 
 DOCS=( AUTHORS README TODO )
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use regex; then
+		if tc-is-gcc && ! version_is_at_least 4.9 $(gcc-version); then
+			die "Clang or GCC >= 4.9 is required for proper regex support"
+		fi
+	fi
+}
+
 src_prepare() {
+	eapply "${FILESDIR}/pms-9999-fix-automagic-dep.patch"
 	eapply_user
 
 	eautoreconf
@@ -35,9 +48,10 @@ src_prepare() {
 
 src_configure() {
 	# Required for ncurses[tinfo]
-	append-cppflags $(pkg-config --cflags ncursesw)
-	append-libs $(pkg-config --libs ncursesw)
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags ncursesw)
+	append-libs $($(tc-getPKG_CONFIG) --libs ncursesw)
 
 	econf \
-		$(use_enable regex)
+		$(use_enable regex) \
+		$(use_with doc)
 }

[gentoo-commits] repo/gentoo:master commit in: media-sound/pms/files/, media-sound/pms/

[Sam James]

commit:     469899e6998360e2b6490a6aaeb55d393727a91f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 16:42:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 16:42:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469899e6

media-sound/pms: fix build with GCC 12

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

 media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch | 11 +++++++++++
 media-sound/pms/pms-0.42_p20170508-r1.ebuild              |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch b/media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch
new file mode 100644
index 000000000000..b0d586eff2c3
--- /dev/null
+++ b/media-sound/pms/files/pms-0.42_p20170508-gcc12-time.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/851621
+--- a/src/message.cpp
++++ b/src/message.cpp
+@@ -23,6 +23,7 @@
+ 
+ 
+ #include <cstdarg>
++#include <ctime>
+ #include <stdio.h>
+ #include "message.h"
+ 

diff --git a/media-sound/pms/pms-0.42_p20170508-r1.ebuild b/media-sound/pms/pms-0.42_p20170508-r1.ebuild
index 9f0546f7b158..750e97d2c674 100644
--- a/media-sound/pms/pms-0.42_p20170508-r1.ebuild
+++ b/media-sound/pms/pms-0.42_p20170508-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.42_p20170508-gcc12-time.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DOC=$(usex doc)