public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpc/, media-sound/ncmpc/files/
@ 2015-10-18 15:10 Christoph Mende
  0 siblings, 0 replies; 3+ messages in thread
From: Christoph Mende @ 2015-10-18 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     58f05ae177a527756922e9e3cf3ebbdb64a6c9a3
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 15:10:07 2015 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 15:10:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58f05ae1

media-sound/ncmpc: link against ncursesw instead of ncurses (bug #554256)

 media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch           | 16 +++++++++-------
 .../ncmpc/{ncmpc-0.24-r1.ebuild => ncmpc-0.24-r2.ebuild} |  9 +++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
index 40ee006..5c11e76 100644
--- a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
+++ b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
@@ -1,6 +1,8 @@
+diff --git a/configure.ac b/configure.ac
+index 2d79f35..b82dd49 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -17,11 +17,8 @@
+@@ -17,11 +17,8 @@ AC_CONFIG_MACRO_DIR([m4])
  dnl Check for programs
  AC_PROG_CC_C99
  AC_PROG_INSTALL
@@ -13,19 +15,19 @@
  
  dnl =======================================================
  dnl initialize variables
-@@ -83,6 +80,19 @@
+@@ -83,6 +80,19 @@ mingw32* | windows*)
  esac
  AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
  
-+dnl ncurses
++dnl ncursesw
 +
-+PKG_CHECK_MODULES([ncurses], [ncurses],[
-+	LIBS="$LIBS $ncurses_LIBS"
++PKG_CHECK_MODULES([ncursesw], [ncursesw],[
++	LIBS="$LIBS $ncursesw_LIBS"
 +	ax_cv_curses_color=yes
 +	ax_cv_curses_mouse=yes
 +	ax_cv_curses_enhanced=yes
 +	AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if the Ncurses library is present])
-+	AC_SUBST([CURSES_LIB],[$ncurses_LIBS])
++	AC_SUBST([CURSES_LIB],[$ncursesw_LIBS])
 +	],
 +	[AC_MSG_ERROR([No curses support detected.])])
 +
@@ -33,7 +35,7 @@
  dnl multi-byte character support
  
  AC_ARG_ENABLE([multibyte],
-@@ -207,12 +217,6 @@
+@@ -207,12 +217,6 @@ AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$enable_help_screen = xyes)
  
  dnl Optional - curses getmouse support
  

diff --git a/media-sound/ncmpc/ncmpc-0.24-r1.ebuild b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
similarity index 86%
rename from media-sound/ncmpc/ncmpc-0.24-r1.ebuild
rename to media-sound/ncmpc/ncmpc-0.24-r2.ebuild
index 1e6e9f9..533e1df 100644
--- a/media-sound/ncmpc/ncmpc-0.24-r1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
@@ -16,9 +16,8 @@ IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics
 
 RDEPEND=">=dev-libs/glib-2.12:2
 	>=media-libs/libmpdclient-2.3
-	sys-libs/ncurses
-	lirc? ( app-misc/lirc )
-	nls? ( sys-libs/ncurses[unicode] )"
+	sys-libs/ncurses[unicode]
+	lirc? ( app-misc/lirc )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig"
@@ -26,7 +25,9 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.24-tinfo.patch
+	# default ax_with_curses.m4 produces automagic dependency on ncursesw
+	# also, ncursesw is required for colors (bug #554245), so we force it here
+	epatch "${FILESDIR}"/${PN}-0.24-tinfo2.patch
 
 	cp "${FILESDIR}"/ax_require_defined.m4 m4/ || die
 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpc/, media-sound/ncmpc/files/
@ 2018-09-09  6:16 Mikle Kolyada
  0 siblings, 0 replies; 3+ messages in thread
From: Mikle Kolyada @ 2018-09-09  6:16 UTC (permalink / raw
  To: gentoo-commits

commit:     6c6fc2c5db035ad5904cc71e1097307437a4a9a1
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  9 06:16:27 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Sep  9 06:16:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6fc2c5

media-sound/ncmpc: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-sound/ncmpc/Manifest                     |  2 -
 media-sound/ncmpc/files/ax_require_defined.m4  | 37 ---------------
 media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch | 50 ---------------------
 media-sound/ncmpc/ncmpc-0.24-r2.ebuild         | 62 --------------------------
 media-sound/ncmpc/ncmpc-0.24.ebuild            | 52 ---------------------
 media-sound/ncmpc/ncmpc-0.25.ebuild            | 60 -------------------------
 6 files changed, 263 deletions(-)

diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index d80598bdfdf..32fb44fc22e 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,4 +1,2 @@
-DIST ncmpc-0.24.tar.xz 298012 BLAKE2B 0f09258d3cf490ff32182f7a803ada8a79c9f0c314c668b165a611a1514e86169784f22e457a311dec4936ebfabf8b0578d75452b50a52275a0215a12bbf4921 SHA512 852bedec9d1e0f13748d00ded8a57b7824a3907fa4aef441cd016c13b3a4229e630957ee965d9f5cf7c1a0c47bfa3bb040058d32c6fcf6b4474acc57f834d929
-DIST ncmpc-0.25.tar.xz 298128 BLAKE2B 2b9eb104f8c56d4bf9faae5d27b20a725b2144ab938e91d79cfa99c982b5e1822387bf26cebe4c08a2f2be39c3f191c06cdc5e9ab16f060a946bca8bd2ec04a3 SHA512 8c871db367a70ec3b68c1337d6ec26b8ca4982cd11f674abd17bf6c5df429d366a7b531f8668d4665688b5ae9a4f5f2ba92bb1a36cf491bf8dd3f8874699b0b3
 DIST ncmpc-0.27.tar.xz 302636 BLAKE2B 95cedfdcd93d011aa21b773c3a91a20cf9c816dfa421e95802b6cc73e39d39e80bed7734764caf8e29102df6b734dcc0c64be6ef3060de8ac590dc1229b63fd4 SHA512 255b5529a5eae14d89d9419dfb06d91c50b68a9e05f2e124fc07035e2a4619c7b6801c08d52c639d934b50f939cf1dc58f3c5265805ce8eeeba211803108f663
 DIST ncmpc-0.30.tar.xz 245212 BLAKE2B 9e64188ec5d209a682f10587c033d1e958501ed84660bc8cc0a00ff3650a1509464e48431240eebe4a061dc154acbc7d6f552cb48b208107ecdc5c0e6807d9ee SHA512 bc92c51c78f7919eb6b5cebaac8bda1231701fd9011fcadd6da8bbc5cc16e5dbe30d33d6e2f7d4cc07399299bcd3de572c9516f90d0376212771fd2c3af8afc7

diff --git a/media-sound/ncmpc/files/ax_require_defined.m4 b/media-sound/ncmpc/files/ax_require_defined.m4
deleted file mode 100644
index cae11112d90..00000000000
--- a/media-sound/ncmpc/files/ax_require_defined.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_REQUIRE_DEFINED(MACRO)
-#
-# DESCRIPTION
-#
-#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
-#   been defined and thus are available for use.  This avoids random issues
-#   where a macro isn't expanded.  Instead the configure script emits a
-#   non-fatal:
-#
-#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
-#
-#   It's like AC_REQUIRE except it doesn't expand the required macro.
-#
-#   Here's an example:
-#
-#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-#
-# LICENSE
-#
-#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 1
-
-AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
-  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
-])dnl AX_REQUIRE_DEFINED

diff --git a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
deleted file mode 100644
index 5c11e7682b5..00000000000
--- a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 2d79f35..b82dd49 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,11 +17,8 @@ AC_CONFIG_MACRO_DIR([m4])
- dnl Check for programs
- AC_PROG_CC_C99
- AC_PROG_INSTALL
--AX_WITH_CURSES
-+PKG_PROG_PKG_CONFIG
- 
--AS_IF([ test "x$ax_cv_curses" = xno ],
--	[AC_MSG_ERROR([No curses support detected.])
--	])
- 
- dnl =======================================================
- dnl initialize variables
-@@ -83,6 +80,19 @@ mingw32* | windows*)
- esac
- AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
- 
-+dnl ncursesw
-+
-+PKG_CHECK_MODULES([ncursesw], [ncursesw],[
-+	LIBS="$LIBS $ncursesw_LIBS"
-+	ax_cv_curses_color=yes
-+	ax_cv_curses_mouse=yes
-+	ax_cv_curses_enhanced=yes
-+	AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if the Ncurses library is present])
-+	AC_SUBST([CURSES_LIB],[$ncursesw_LIBS])
-+	],
-+	[AC_MSG_ERROR([No curses support detected.])])
-+
-+
- dnl multi-byte character support
- 
- AC_ARG_ENABLE([multibyte],
-@@ -207,12 +217,6 @@ AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$enable_help_screen = xyes)
- 
- dnl Optional - curses getmouse support
- 
--dnl AC_CHECK_LIB depends on being able to prepend a '-l', remove the '-l' from CURSES_LIB first
--AC_CHECK_LIB([$(expr substr $CURSES_LIB 3 99)],
--		[getmouse],
--		[ax_cv_curses_mouse=yes],
--		[ax_cv_curses_mouse=no])
--
- AC_ARG_ENABLE([mouse], 
- 	AS_HELP_STRING([--enable-mouse],
- 		[Enable curses getmouse support @<:@default=yes@:>@]),

diff --git a/media-sound/ncmpc/ncmpc-0.24-r2.ebuild b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
deleted file mode 100644
index d4322124200..00000000000
--- a/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib
-
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=media-libs/libmpdclient-2.3
-	sys-libs/ncurses:*[unicode]
-	lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
-
-src_prepare() {
-	# default ax_with_curses.m4 produces automagic dependency on ncursesw
-	# also, ncursesw is required for colors (bug #554245), so we force it here
-	epatch "${FILESDIR}"/${PN}-0.24-tinfo.patch
-	eapply_user
-
-	cp "${FILESDIR}"/ax_require_defined.m4 m4/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# upstream lirc doesn't have pkg-config file wrt #250015
-	if use lirc; then
-		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
-		export LIBLIRCCLIENT_LIBS="-llirc_client"
-	fi
-
-	# use_with lyrics-screen is for multilib
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable artist-screen) \
-		$(use_enable chat-screen) \
-		$(use_enable colors) \
-		$(use_enable debug) \
-		$(use_enable help-screen) \
-		$(use_enable key-screen) \
-		$(use_enable lirc) \
-		$(use_enable lyrics-screen) \
-		$(use_enable mouse) \
-		$(use_enable nls locale) \
-		$(use_enable nls multibyte) \
-		$(use_enable nls) \
-		$(use_enable search-screen) \
-		$(use_enable song-screen) \
-		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
-}

diff --git a/media-sound/ncmpc/ncmpc-0.24.ebuild b/media-sound/ncmpc/ncmpc-0.24.ebuild
deleted file mode 100644
index aba8b2f4b0b..00000000000
--- a/media-sound/ncmpc/ncmpc-0.24.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=media-libs/libmpdclient-2.3
-	sys-libs/ncurses:*
-	lirc? ( app-misc/lirc )
-	nls? ( sys-libs/ncurses:*[unicode] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
-
-src_configure() {
-	# upstream lirc doesn't have pkg-config file wrt #250015
-	if use lirc; then
-		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
-		export LIBLIRCCLIENT_LIBS="-llirc_client"
-	fi
-
-	# use_with lyrics-screen is for multilib
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable artist-screen) \
-		$(use_enable chat-screen) \
-		$(use_enable colors) \
-		$(use_enable debug) \
-		$(use_enable help-screen) \
-		$(use_enable key-screen) \
-		$(use_enable lirc) \
-		$(use_enable lyrics-screen) \
-		$(use_enable mouse) \
-		$(use_enable nls locale) \
-		$(use_enable nls multibyte) \
-		$(use_enable nls) \
-		$(use_enable search-screen) \
-		$(use_enable song-screen) \
-		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
-}

diff --git a/media-sound/ncmpc/ncmpc-0.25.ebuild b/media-sound/ncmpc/ncmpc-0.25.ebuild
deleted file mode 100644
index 23bdfa52ca9..00000000000
--- a/media-sound/ncmpc/ncmpc-0.25.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=media-libs/libmpdclient-2.3
-	sys-libs/ncurses:*[unicode]
-	lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
-
-src_prepare() {
-	# default ax_with_curses.m4 produces automagic dependency on ncursesw
-	# also, ncursesw is required for colors (bug #554245), so we force it here
-	local PATCHES=( "${FILESDIR}"/${PN}-0.24-tinfo.patch )
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# upstream lirc doesn't have pkg-config file wrt #250015
-	if use lirc; then
-		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
-		export LIBLIRCCLIENT_LIBS="-llirc_client"
-	fi
-
-	# use_with lyrics-screen is for multilib
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable artist-screen) \
-		$(use_enable chat-screen) \
-		$(use_enable colors) \
-		$(use_enable debug) \
-		$(use_enable help-screen) \
-		$(use_enable key-screen) \
-		$(use_enable lirc) \
-		$(use_enable lyrics-screen) \
-		$(use_enable mouse) \
-		$(use_enable nls locale) \
-		$(use_enable nls multibyte) \
-		$(use_enable nls) \
-		$(use_enable search-screen) \
-		$(use_enable song-screen) \
-		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpc/, media-sound/ncmpc/files/
@ 2019-06-14 20:42 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-06-14 20:42 UTC (permalink / raw
  To: gentoo-commits

commit:     39dce3a79fbfd77acea8bd244f1b1eac4ace7c47
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 19:16:04 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 20:42:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39dce3a7

media-sound/ncmpc: Drop 0.33-r1

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/ncmpc/Manifest                      |  1 -
 media-sound/ncmpc/files/ncmpc-0.33-mandir.patch | 25 ---------
 media-sound/ncmpc/ncmpc-0.33-r1.ebuild          | 71 -------------------------
 3 files changed, 97 deletions(-)

diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 11427d75595..5f4d9e99601 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,2 +1 @@
-DIST ncmpc-0.33.tar.xz 226344 BLAKE2B d52fdcb17adda1d3d61645715029552804edbf8ed95d2f19e0a25ba11f66cf0e7921748aebceb63e8e32b8d31fbc2d387dfbed6bd5c6a735d5ffa4b17d9b4fa3 SHA512 47730003c9a8ad5b6e682de4b4d3c8882d3266659fcd73ea131d1bba3d6b4d9ac66bb1a3522d63cb238ca9e22d8035907b9d7621a0b5106763770b17325f53b9
 DIST ncmpc-0.34.tar.xz 227892 BLAKE2B 19d9d9abe3d85cb2567a222c8ce108889d4517272e2bb82f4064ef76af68d610ff4c7516102b976f66380e0e3d3ee7ed00023116cb6b2d1628e3d38796705a09 SHA512 e206cc2d61799a97edf1182de4cee1c0fa447bd1fac136dc48670cb624a7efc903c693b0c541fbc00fcb94e055c83be1ca6370386c99131a1b571f47b67c35f4

diff --git a/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch b/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
deleted file mode 100644
index 0bc3798bc5e..00000000000
--- a/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 821acdad907d1558c570bca6e2ac63d55905f363 Mon Sep 17 00:00:00 2001
-From: kaliko <kaliko@azylum.org>
-Date: Mon, 10 Dec 2018 13:46:42 +0100
-Subject: [PATCH] Fixed manual install dir
-
----
- doc/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/meson.build b/doc/meson.build
-index aadea58..f4b491d 100644
---- a/doc/meson.build
-+++ b/doc/meson.build
-@@ -30,9 +30,9 @@ endif
- if get_option('manual')
-   custom_target(
-     'Manpage documentation',
--    output: 'man',
-+    output: 'man1',
-     input: ['index.rst', 'conf.py'],
--    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
-+    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@'],
-     build_by_default: true,
-     install: true,
-     install_dir: get_option('mandir'),

diff --git a/media-sound/ncmpc/ncmpc-0.33-r1.ebuild b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
deleted file mode 100644
index 2746f5e2c15..00000000000
--- a/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-RDEPEND="
-	>=media-libs/libmpdclient-2.9
-	sys-libs/ncurses:0=[unicode]
-	lirc? ( app-misc/lirc )
-	pcre? ( dev-libs/libpcre )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.62
-"
-
-PATCHES=( "${FILESDIR}/${P}-mandir.patch" )
-
-src_prepare() {
-	default
-
-	# use correct docdir and don't install license file
-	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
-		-e "s/'COPYING', //" \
-		-i meson.build || die
-
-	# use correct (html) docdir
-	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
-		-i doc/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcurses=ncursesw
-		-Dcolors=true
-		-Dmini=false
-		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
-		-Dasync_connect=$(usex async-connect true false)
-		-Dchat_screen=$(usex chat-screen true false)
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Dhelp_screen=$(usex help-screen true false)
-		-Dkey_screen=$(usex key-screen true false)
-		-Dlibrary_screen=$(usex library-screen true false)
-		-Dlirc=$(usex lirc enabled disabled)
-		-Dlocale=$(usex nls enabled disabled)
-		-Dlyrics_screen=$(usex lyrics-screen true false)
-		-Dmouse=$(usex mouse enabled disabled)
-		-Dmultibyte=$(usex nls true false)
-		-Dnls=$(usex nls enabled disabled)
-		-Doutputs_screen=$(usex outputs-screen true false)
-		-Dregex=$(usex pcre enabled disabled)
-		-Dsearch_screen=$(usex search-screen true false)
-		-Dsong_screen=$(usex song-screen true false)
-	)
-
-	meson_src_configure
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-06-14 20:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-14 20:42 [gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpc/, media-sound/ncmpc/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2018-09-09  6:16 Mikle Kolyada
2015-10-18 15:10 Christoph Mende

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox